Skip to content

Commit 16e11a9

Browse files
just-borisjust-boris
committed
continue work
1 parent 0dfe633 commit 16e11a9

File tree

84 files changed

+5784
-3667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+5784
-3667
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
{
168168
"path": "lib/components/internal/widget-exports.js",
169169
"brotli": false,
170-
"limit": "810 kB",
170+
"limit": "830 kB",
171171
"ignore": "react-dom"
172172
}
173173
],

‎pages/app-layout/runtime-drawers.page.tsx

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
3-
import React, { useContext, useEffect, useRef, useState } from 'react';
3+
import React, { useContext, useRef, useState } from 'react';
44

55
import {
66
AppLayout,
@@ -31,18 +31,6 @@ type DemoContext = React.Context<
3131
}>
3232
>;
3333

34-
const CustomContent = () => {
35-
useEffect(() => {
36-
console.log('mount');
37-
38-
return () => {
39-
console.log('unmount');
40-
};
41-
}, []);
42-
43-
return <div>Custom content</div>;
44-
};
45-
4634
export default function WithDrawers() {
4735
const [activeDrawerId, setActiveDrawerId] = useState<string | null>(null);
4836
const [helpPathSlug, setHelpPathSlug] = useState<string>('default');
@@ -158,7 +146,6 @@ export default function WithDrawers() {
158146
>
159147
Content
160148
</Header>
161-
<CustomContent />
162149
<Containers />
163150
</ContentLayout>
164151
</div>

‎pages/utils/iframe-wrapper.tsx

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,35 @@ export function IframeWrapper({ id, AppComponent }: { id: string; AppComponent:
3232
const ref = useRef<HTMLDivElement>(null);
3333

3434
useEffect(() => {
35-
setTimeout(() => {
36-
const container = ref.current;
37-
if (!container) {
38-
return;
39-
}
40-
const iframeEl = container.ownerDocument.createElement('iframe');
41-
iframeEl.className = styles['full-screen'];
42-
iframeEl.id = id;
43-
iframeEl.title = id;
44-
container.appendChild(iframeEl);
35+
const container = ref.current;
36+
if (!container) {
37+
return;
38+
}
39+
const iframeEl = container.ownerDocument.createElement('iframe');
40+
iframeEl.className = styles['full-screen'];
41+
iframeEl.id = id;
42+
iframeEl.title = id;
43+
container.appendChild(iframeEl);
4544

46-
const iframeDocument = iframeEl.contentDocument!;
47-
// Prevent iframe document instance from reload
48-
// https://bugzilla.mozilla.org/show_bug.cgi?id=543435
49-
iframeDocument.open();
50-
// set html5 doctype
51-
iframeDocument.writeln('<!DOCTYPE html>');
52-
iframeDocument.close();
45+
const iframeDocument = iframeEl.contentDocument!;
46+
// Prevent iframe document instance from reload
47+
// https://bugzilla.mozilla.org/show_bug.cgi?id=543435
48+
iframeDocument.open();
49+
// set html5 doctype
50+
iframeDocument.writeln('<!DOCTYPE html>');
51+
iframeDocument.close();
5352

54-
const innerAppRoot = iframeDocument.createElement('div');
55-
iframeDocument.body.appendChild(innerAppRoot);
56-
copyStyles(document, iframeDocument);
57-
iframeDocument.dir = document.dir;
58-
const syncClassesCleanup = syncClasses(document.body, iframeDocument.body);
59-
ReactDOM.render(<AppComponent />, innerAppRoot);
60-
return () => {
61-
syncClassesCleanup();
62-
ReactDOM.unmountComponentAtNode(innerAppRoot);
63-
container.removeChild(iframeEl);
64-
};
65-
}, 50);
53+
const innerAppRoot = iframeDocument.createElement('div');
54+
iframeDocument.body.appendChild(innerAppRoot);
55+
copyStyles(document, iframeDocument);
56+
iframeDocument.dir = document.dir;
57+
const syncClassesCleanup = syncClasses(document.body, iframeDocument.body);
58+
ReactDOM.render(<AppComponent />, innerAppRoot);
59+
return () => {
60+
syncClassesCleanup();
61+
ReactDOM.unmountComponentAtNode(innerAppRoot);
62+
container.removeChild(iframeEl);
63+
};
6664
}, [id, AppComponent]);
6765

6866
return <div ref={ref}></div>;

‎src/app-layout-toolbar/__tests__/analytics-metadata.test.tsx

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33
import React from 'react';
4-
import { act, render, waitFor } from '@testing-library/react';
4+
import { act, render } from '@testing-library/react';
55

66
import {
77
activateAnalyticsMetadata,
@@ -125,7 +125,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
125125
});
126126
});
127127
describe('with tools', () => {
128-
test('closed', async () => {
128+
test('closed', () => {
129129
const wrapper = renderToolbar({
130130
tools: <span>tools</span>,
131131
toolsOpen: false,
@@ -134,9 +134,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
134134
toolsToggle: 'toggle tools',
135135
},
136136
});
137-
await waitFor(() => {
138-
expect(wrapper.findToolsToggle()).toBeTruthy();
139-
});
140137
const toolsTrigger = wrapper.findToolsToggle().getElement();
141138
validateComponentNameAndLabels(toolsTrigger, {});
142139
expect(getGeneratedAnalyticsMetadata(toolsTrigger)).toEqual({
@@ -147,7 +144,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
147144
...getMetadata(),
148145
});
149146
});
150-
test('open', async () => {
147+
test('open', () => {
151148
const wrapper = renderToolbar({
152149
tools: <span>tools</span>,
153150
toolsOpen: true,
@@ -157,9 +154,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
157154
toolsClose: 'close tools',
158155
},
159156
});
160-
await waitFor(() => {
161-
expect(wrapper.findToolsToggle()).toBeTruthy();
162-
});
163157
const toolsTrigger = wrapper.findToolsToggle().getElement();
164158
validateComponentNameAndLabels(toolsTrigger, {});
165159
expect(getGeneratedAnalyticsMetadata(toolsTrigger)).toEqual({
@@ -180,7 +174,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
180174
});
181175

182176
describe('with local drawer', () => {
183-
test('closed', async () => {
177+
test('closed', () => {
184178
const wrapper = renderToolbar({
185179
drawers: [
186180
{
@@ -197,9 +191,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
197191
},
198192
],
199193
});
200-
await waitFor(() => {
201-
expect(wrapper.findDrawerTriggerById('test-drawer')).toBeTruthy();
202-
});
203194
const drawerTrigger = wrapper.findDrawerTriggerById('test-drawer')!.getElement();
204195
validateComponentNameAndLabels(drawerTrigger, {});
205196
expect(getGeneratedAnalyticsMetadata(drawerTrigger)).toEqual({
@@ -210,7 +201,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
210201
...getMetadata(),
211202
});
212203
});
213-
test('open', async () => {
204+
test('open', () => {
214205
const wrapper = renderToolbar({
215206
drawers: [
216207
{
@@ -241,9 +232,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
241232
activeDrawerId: 'test-drawer',
242233
onDrawerChange: () => {},
243234
});
244-
await waitFor(() => {
245-
expect(wrapper.findDrawerTriggerById('test-drawer')).toBeTruthy();
246-
});
247235
const drawerTrigger = wrapper.findDrawerTriggerById('test-drawer')!.getElement();
248236
validateComponentNameAndLabels(drawerTrigger, {});
249237
expect(getGeneratedAnalyticsMetadata(drawerTrigger)).toEqual({
@@ -331,7 +319,7 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
331319
});
332320

333321
describe('with split panel', () => {
334-
test.each(['open', 'close'])('%s', async action => {
322+
test.each(['open', 'close'])('%s', action => {
335323
const wrapper = renderToolbar({
336324
splitPanel: (
337325
<SplitPanel i18nStrings={{ openButtonAriaLabel: 'open split panel' }} header="Split panel header">
@@ -341,9 +329,6 @@ describe('AppLayoutToolbar renders correct analytics metadata', () => {
341329
splitPanelOpen: action !== 'open',
342330
onSplitPanelToggle: () => {},
343331
});
344-
await waitFor(() => {
345-
expect(wrapper.findSplitPanelOpenButton()).toBeTruthy();
346-
});
347332
const splitPanelTrigger = wrapper.findSplitPanelOpenButton()!.getElement();
348333
validateComponentNameAndLabels(splitPanelTrigger, {});
349334
expect(getGeneratedAnalyticsMetadata(splitPanelTrigger)).toEqual({

‎src/app-layout-toolbar/__tests__/app-layout-toolbar.test.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
3-
/* eslint simple-import-sort/imports: 0 */
43
import React, { useRef, useState } from 'react';
5-
import { render } from '@testing-library/react';
4+
import { render, waitFor } from '@testing-library/react';
5+
66
import { clearVisualRefreshState } from '@cloudscape-design/component-toolkit/internal/testing';
7+
78
import AppLayoutToolbar, { AppLayoutToolbarProps } from '../../../lib/components/app-layout-toolbar';
8-
import createWrapper from '../../../lib/components/test-utils/dom';
99
import BreadcrumbGroup from '../../../lib/components/breadcrumb-group';
10+
import createWrapper from '../../../lib/components/test-utils/dom';
1011

1112
function renderComponent(jsx: React.ReactElement) {
1213
const { container, rerender } = render(jsx);
@@ -35,7 +36,7 @@ describe('AppLayoutToolbar component', () => {
3536
);
3637
});
3738

38-
test('triggerless navigation', () => {
39+
test('triggerless navigation', async () => {
3940
const AppLayoutToolbarWrapper = () => {
4041
const [isNavigationOpen, setIsNavigationOpen] = useState(false);
4142
const appLayoutToolbarRef = useRef<AppLayoutToolbarProps.Ref>(null);
@@ -72,8 +73,9 @@ describe('AppLayoutToolbar component', () => {
7273
wrapper.find(`[data-testid="toggle-navigation"]`)!.click();
7374

7475
expect(wrapper.findOpenNavigationPanel()).toBeTruthy();
75-
// TODO: for some reason this does not work in the JSDOM env, but does in an actual browser
76-
// expect(wrapper.findNavigationClose()!.getElement()).toHaveFocus();
76+
await waitFor(() => {
77+
expect(wrapper.findNavigationClose()!.getElement()).toHaveFocus();
78+
});
7779
});
7880

7981
test('triggerless drawers', () => {

0 commit comments

Comments
 (0)