diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js index 03720d156c..3e66451887 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js @@ -485,7 +485,7 @@ describe('Wysiwyg render and actions buttons', () => { .c15 { color: #666687; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap index 4706e26b60..628e761862 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap @@ -467,7 +467,7 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = ` .c32 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -2286,7 +2286,7 @@ exports[`EditSettingsView should add field 1`] = ` .c32 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -4598,7 +4598,7 @@ exports[`EditSettingsView should add relation 1`] = ` .c32 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap index cbda7e01c2..8f7b86e24b 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap @@ -362,7 +362,7 @@ exports[`ADMIN | CM | LV | Configure the view renders and matches the snapshot 1 .c54 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -2166,7 +2166,7 @@ exports[`ADMIN | CM | LV | Configure the view should add field 1`] = ` .c54 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js index caca7f6427..2f0e2b8a5f 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js @@ -257,7 +257,7 @@ describe('ADMIN | Pages | Profile page', () => { .c40 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js index 6da6ed0609..33e6dc9171 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js @@ -324,7 +324,7 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => { .c32 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/__snapshots__/index.test.js.snap index b5747889c6..ce634a10fd 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/__snapshots__/index.test.js.snap @@ -252,7 +252,7 @@ exports[`DynamicTable renders and matches the snapshot 1`] = ` .c10 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js index eccef03597..1be67adabe 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js @@ -702,7 +702,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { .c56 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/index.test.js index ed75ebbfa5..d8e2640073 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/index.test.js @@ -220,7 +220,7 @@ describe('Admin | ee | SettingsPage | SSO', () => { .c45 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index f4e66afc31..8ac7a1c413 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -33,9 +33,9 @@ "@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/react-fontawesome": "^0.1.14", "@strapi/babel-plugin-switch-ee-ce": "1.0.0", - "@strapi/design-system": "0.0.1-alpha.64", + "@strapi/design-system": "0.0.1-alpha.67", "@strapi/helper-plugin": "3.6.8", - "@strapi/icons": "0.0.1-alpha.64", + "@strapi/icons": "0.0.1-alpha.67", "@strapi/utils": "3.6.8", "axios": "0.24.0", "babel-loader": "8.2.2", diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/index.js index 8662c3c0fe..ad98b96a39 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/index.js @@ -1,4 +1,4 @@ -import React, { useCallback, useEffect, useMemo } from 'react'; +import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import { getYupInnerErrors, useTracking, @@ -93,6 +93,8 @@ const FormModal = () => { targetUid, } = useFormModalNavigation(); + const tabGroupRef = useRef(); + const formModalSelector = useMemo(makeSelectFormModal, []); const dispatch = useDispatch(); const toggleNotification = useNotification(); @@ -554,6 +556,8 @@ const FormModal = () => { type: RESET_PROPS_AND_SET_THE_FORM_FOR_ADDING_A_COMPO_TO_A_DZ, }); + tabGroupRef.current._handlers.setSelectedTabIndex(0); + onNavigateToAddCompoToDZModal({ dynamicZoneTarget: modifiedData.name }); } else { onCloseModal(); @@ -917,6 +921,7 @@ const FormModal = () => { label="todo" id="tabs" variant="simple" + ref={tabGroupRef} onTabChange={selectedTab => { if (selectedTab === 1) { sendAdvancedTabEvent('advanced'); diff --git a/packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap b/packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap index f9ae83a619..0b7b9be237 100644 --- a/packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap @@ -682,7 +682,7 @@ exports[` renders and matches the snapshot 1`] = ` .c64 { font-weight: 600; color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/email/admin/src/pages/Settings/tests/index.test.js b/packages/core/email/admin/src/pages/Settings/tests/index.test.js index e5f1827f66..46cb4714cc 100644 --- a/packages/core/email/admin/src/pages/Settings/tests/index.test.js +++ b/packages/core/email/admin/src/pages/Settings/tests/index.test.js @@ -222,7 +222,7 @@ describe('Email | Pages | Settings', () => { .c29 { color: #666687; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap b/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap index 0546e24cb4..b4df772838 100644 --- a/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap +++ b/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap @@ -176,7 +176,7 @@ exports[`DateTimePicker snapshots the component 1`] = ` .c21 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/tests/__snapshots__/index.test.js.snap b/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/tests/__snapshots__/index.test.js.snap index 964fb0213d..6ced750068 100644 --- a/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/tests/__snapshots__/index.test.js.snap +++ b/packages/core/helper-plugin/lib/src/components/FilterListURLQuery/tests/__snapshots__/index.test.js.snap @@ -29,6 +29,11 @@ exports[` renders and matches the snapshot 1`] = ` color: #4945ff; padding-right: 12px; padding-left: 12px; + border-radius: 4px; + border-style: solid; + border-width: 1px; + border-color: #d9d8ff; + height: 2rem; } .c6 { @@ -49,12 +54,6 @@ exports[` renders and matches the snapshot 1`] = ` align-items: center; } -.c2 { - border: 1px solid #d9d8ff; - border-radius: 4px; - height: 2rem; -} - .c2 svg { height: 0.5rem; width: 0.5rem; @@ -74,7 +73,9 @@ exports[` renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > ', () => { .c8 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index f7a34d68ec..3de9804259 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -57,8 +57,8 @@ "@storybook/builder-webpack5": "^6.3.7", "@storybook/manager-webpack5": "^6.3.7", "@storybook/react": "^6.3.7", - "@strapi/design-system": "0.0.1-alpha.64", - "@strapi/icons": "0.0.1-alpha.64", + "@strapi/design-system": "0.0.1-alpha.67", + "@strapi/icons": "0.0.1-alpha.67", "babel-loader": "^8.2.2", "cross-env": "^7.0.3", "date-fns": "2.22.1", diff --git a/packages/core/upload/admin/src/components/EmptyAssets/index.js b/packages/core/upload/admin/src/components/EmptyAssets/index.js index dc35e75a34..48f5343a2b 100644 --- a/packages/core/upload/admin/src/components/EmptyAssets/index.js +++ b/packages/core/upload/admin/src/components/EmptyAssets/index.js @@ -5,7 +5,7 @@ import { Typography } from '@strapi/design-system/Typography'; import { Stack } from '@strapi/design-system/Stack'; import { Box } from '@strapi/design-system/Box'; import { Icon } from '@strapi/design-system/Icon'; -import EmptyStateDocument from '@strapi/icons/EmptyStateDocument'; +import EmptyStateDocument from '@strapi/icons/EmptyDocuments'; import { EmptyAssetGrid } from './EmptyAssetGrid'; const EnhancedStack = styled(Stack)` diff --git a/packages/core/upload/admin/src/components/FilterList/tests/__snapshots__/index.test.js.snap b/packages/core/upload/admin/src/components/FilterList/tests/__snapshots__/index.test.js.snap index 2ba11938c4..6e48975a20 100644 --- a/packages/core/upload/admin/src/components/FilterList/tests/__snapshots__/index.test.js.snap +++ b/packages/core/upload/admin/src/components/FilterList/tests/__snapshots__/index.test.js.snap @@ -29,6 +29,11 @@ exports[` renders and matches the snapshot 1`] = ` color: #4945ff; padding-right: 12px; padding-left: 12px; + border-radius: 4px; + border-style: solid; + border-width: 1px; + border-color: #d9d8ff; + height: 2rem; } .c6 { @@ -49,12 +54,6 @@ exports[` renders and matches the snapshot 1`] = ` align-items: center; } -.c2 { - border: 1px solid #d9d8ff; - border-radius: 4px; - height: 2rem; -} - .c2 svg { height: 0.5rem; width: 0.5rem; @@ -74,7 +73,9 @@ exports[` renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > renders and matches the snapshot 1`] = ` class="c0" > { .c27 { color: #32324d; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/yarn.lock b/yarn.lock index 2ae303cb5e..bf752d8b0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5234,19 +5234,19 @@ resolve-from "^5.0.0" store2 "^2.12.0" -"@strapi/design-system@0.0.1-alpha.64": - version "0.0.1-alpha.64" - resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.64.tgz#07ff58d2b2b713424cc8b9624e9a88e58e91cdd3" - integrity sha512-myCOoOUFrJPATcWtG268BBQmR23+7lay2gVN01HZh2wiTAqhOUOVNQo9yvjvsC4lUOH/brSbBEPwmW4kQ5S5iw== +"@strapi/design-system@0.0.1-alpha.67": + version "0.0.1-alpha.67" + resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.67.tgz#38fc39836a49b239afc6e178d2edd7b06851f806" + integrity sha512-0nkRWKEBHx/O0tQZ70WD1201XUmryhDylZptxT1TBKBaUdO/7vwbViF7HKZi77jHBYF9xN5w5AeUVY8yOqWXBQ== dependencies: "@internationalized/number" "^3.0.2" compute-scroll-into-view "^1.0.17" prop-types "^15.7.2" -"@strapi/icons@0.0.1-alpha.64": - version "0.0.1-alpha.64" - resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.64.tgz#4fc04e62fb37f5f02411281b4932460893498092" - integrity sha512-wMkdbx1115nC2pGuIM/xGc4HqkrZPDje/pqnI3Zv9RHtfl5mOVpvmC4rBAKy3EOg2dbmeVy6JPLOvah8GYaEkw== +"@strapi/icons@0.0.1-alpha.67": + version "0.0.1-alpha.67" + resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.67.tgz#797bd7bbff4107006c93e20edb4e2736c1bc564b" + integrity sha512-t2BjpQpXLoX3Tc4f+HxfoQifx1Z9uSVDjwLxld360Aq3zVXknpdUiU+kJsxl8BHj/8H6PB/KS5vB2lcjl4/7Vg== "@stylelint/postcss-css-in-js@^0.37.2": version "0.37.2"