Skip to content

Commit 9ea076f

Browse files
rezrahrezrah
authored
Merge branch 'main' into bugfix/fix-textinput-icon-with-block-prop
2 parents acb87de + 2a61b8d commit 9ea076f

File tree

2 files changed

+37
-137
lines changed

2 files changed

+37
-137
lines changed

‎src/__tests__/AnchoredOverlay.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe('AnchoredOverlay', () => {
144144
})
145145

146146
it('should render consistently when open', () => {
147-
const anchoredOverlay = HTMLRender(<AnchoredOverlayTestComponent initiallyOpen={true} />)
148-
expect(anchoredOverlay).toMatchSnapshot()
147+
const {container} = HTMLRender(<AnchoredOverlayTestComponent initiallyOpen={true} />)
148+
expect(container).toMatchSnapshot()
149149
})
150150
})

‎src/__tests__/__snapshots__/AnchoredOverlay.test.tsx.snap‎

Lines changed: 35 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ exports[`AnchoredOverlay renders consistently 1`] = `
9494
`;
9595

9696
exports[`AnchoredOverlay should render consistently when open 1`] = `
97-
Object {
98-
"asFragment": [Function],
99-
"baseElement": .c0 {
97+
.c0 {
10098
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";
10199
line-height: 1.5;
102100
color: #24292f;
@@ -187,146 +185,48 @@ Object {
187185
outline: none;
188186
}
189187
190-
<body>
191-
<div>
192-
<div
193-
class="c0"
194-
color="fg.default"
195-
data-portal-root="true"
196-
font-family="normal"
197-
>
198-
<button
199-
aria-haspopup="true"
200-
aria-labelledby="react-aria-1"
201-
class="c1"
202-
id="react-aria-1"
203-
tabindex="0"
204-
>
205-
Anchor Button
206-
</button>
207-
<div
208-
id="__primerPortalRoot__"
209-
style="position: absolute; top: 0px; left: 0px;"
210-
>
211-
<div
212-
style="position: relative; z-index: 1;"
213-
>
214-
<div
215-
class="c2"
216-
data-focus-trap="active"
217-
height="auto"
218-
role="none"
219-
style="top: 4px; left: 0px; --styled-overlay-visibility: visible;"
220-
width="auto"
221-
>
222-
<button
223-
class="focus-visible"
224-
data-focus-visible-added=""
225-
tabindex="0"
226-
type="button"
227-
>
228-
Focusable Child
229-
</button>
230-
</div>
231-
</div>
232-
</div>
233-
</div>
234-
</div>
235-
</body>,
236-
"container": <div>
188+
<div>
189+
<div
190+
class="c0"
191+
color="fg.default"
192+
data-portal-root="true"
193+
font-family="normal"
194+
>
195+
<button
196+
aria-haspopup="true"
197+
aria-labelledby="react-aria-1"
198+
class="c1"
199+
id="react-aria-1"
200+
tabindex="0"
201+
>
202+
Anchor Button
203+
</button>
237204
<div
238-
class="BaseStyles__Base-qvuaww-0 ihFkAM"
239-
color="fg.default"
240-
data-portal-root="true"
241-
font-family="normal"
205+
id="__primerPortalRoot__"
206+
style="position: absolute; top: 0px; left: 0px;"
242207
>
243-
<button
244-
aria-haspopup="true"
245-
aria-labelledby="react-aria-1"
246-
class="ButtonBase-sc-181ps9o-0 Button-xjtz72-0 iRqJHc"
247-
id="react-aria-1"
248-
tabindex="0"
249-
>
250-
Anchor Button
251-
</button>
252208
<div
253-
id="__primerPortalRoot__"
254-
style="position: absolute; top: 0px; left: 0px;"
209+
style="position: relative; z-index: 1;"
255210
>
256211
<div
257-
style="position: relative; z-index: 1;"
212+
class="c2"
213+
data-focus-trap="active"
214+
height="auto"
215+
role="none"
216+
style="top: 4px; left: 0px; --styled-overlay-visibility: visible;"
217+
width="auto"
258218
>
259-
<div
260-
class="Overlay__StyledOverlay-jhwkzw-0 jFTKwM"
261-
data-focus-trap="active"
262-
height="auto"
263-
role="none"
264-
style="top: 4px; left: 0px; --styled-overlay-visibility: visible;"
265-
width="auto"
219+
<button
220+
class="focus-visible"
221+
data-focus-visible-added=""
222+
tabindex="0"
223+
type="button"
266224
>
267-
<button
268-
class="focus-visible"
269-
data-focus-visible-added=""
270-
tabindex="0"
271-
type="button"
272-
>
273-
Focusable Child
274-
</button>
275-
</div>
225+
Focusable Child
226+
</button>
276227
</div>
277228
</div>
278229
</div>
279-
</div>,
280-
"debug": [Function],
281-
"findAllByAltText": [Function],
282-
"findAllByDisplayValue": [Function],
283-
"findAllByLabelText": [Function],
284-
"findAllByPlaceholderText": [Function],
285-
"findAllByRole": [Function],
286-
"findAllByTestId": [Function],
287-
"findAllByText": [Function],
288-
"findAllByTitle": [Function],
289-
"findByAltText": [Function],
290-
"findByDisplayValue": [Function],
291-
"findByLabelText": [Function],
292-
"findByPlaceholderText": [Function],
293-
"findByRole": [Function],
294-
"findByTestId": [Function],
295-
"findByText": [Function],
296-
"findByTitle": [Function],
297-
"getAllByAltText": [Function],
298-
"getAllByDisplayValue": [Function],
299-
"getAllByLabelText": [Function],
300-
"getAllByPlaceholderText": [Function],
301-
"getAllByRole": [Function],
302-
"getAllByTestId": [Function],
303-
"getAllByText": [Function],
304-
"getAllByTitle": [Function],
305-
"getByAltText": [Function],
306-
"getByDisplayValue": [Function],
307-
"getByLabelText": [Function],
308-
"getByPlaceholderText": [Function],
309-
"getByRole": [Function],
310-
"getByTestId": [Function],
311-
"getByText": [Function],
312-
"getByTitle": [Function],
313-
"queryAllByAltText": [Function],
314-
"queryAllByDisplayValue": [Function],
315-
"queryAllByLabelText": [Function],
316-
"queryAllByPlaceholderText": [Function],
317-
"queryAllByRole": [Function],
318-
"queryAllByTestId": [Function],
319-
"queryAllByText": [Function],
320-
"queryAllByTitle": [Function],
321-
"queryByAltText": [Function],
322-
"queryByDisplayValue": [Function],
323-
"queryByLabelText": [Function],
324-
"queryByPlaceholderText": [Function],
325-
"queryByRole": [Function],
326-
"queryByTestId": [Function],
327-
"queryByText": [Function],
328-
"queryByTitle": [Function],
329-
"rerender": [Function],
330-
"unmount": [Function],
331-
}
230+
</div>
231+
</div>
332232
`;

0 commit comments

Comments
 (0)