From 469ff7e100172058cdce52b283a39068db249c20 Mon Sep 17 00:00:00 2001 From: godzzo Date: Sun, 13 Feb 2022 07:27:31 +0100 Subject: [PATCH 1/9] DynamicZone - extend FriendlyName with MainValue like RepeatableComponent This commit fixes #12499 --- .../DynamicZone/components/Component/index.js | 19 ++++++++++++++++++- .../DynamicZone/components/Component/util.js | 16 ++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index 599d01a1e4..d46055b96d 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -14,10 +14,12 @@ import { Loader } from '@strapi/design-system/Loader'; import Trash from '@strapi/icons/Trash'; import ArrowDown from '@strapi/icons/ArrowDown'; import ArrowUp from '@strapi/icons/ArrowUp'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { useContentTypeLayout } from '../../../../hooks'; import { getTrad } from '../../../../utils'; import FieldComponent from '../../../FieldComponent'; import Rectangle from './Rectangle'; +import useMainValue from './util'; const ActionStack = styled(Stack)` svg { @@ -58,6 +60,21 @@ const Component = ({ }) => { const { formatMessage } = useIntl(); const { getComponentLayout } = useContentTypeLayout(); + const { modifiedData } = useCMEditViewDataManager(); + const componentLayoutData = useMemo(() => { + const layout = getComponentLayout(componentUid); + + console.log('DZone/Component componentLayoutData', { + componentUid, + layout, + name, + index, + modifiedData, + }); + + return layout; + }, [componentUid, getComponentLayout, index, name, modifiedData]); + const mainValue = useMainValue(componentLayoutData, `${name}.${index}`); const { icon, friendlyName } = useMemo(() => { const { info: { icon, displayName }, @@ -144,7 +161,7 @@ const Component = ({ )} } - title={friendlyName} + title={`${friendlyName} - ${mainValue}`} togglePosition="left" /> diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js new file mode 100644 index 0000000000..202f957dcb --- /dev/null +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js @@ -0,0 +1,16 @@ +import { useMemo } from 'react'; +import { get, toString } from 'lodash'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; + +function useMainValue(schema, componentFieldName) { + const { modifiedData } = useCMEditViewDataManager(); + + const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]); + const displayedValue = toString( + get(modifiedData, [...componentFieldName.split('.'), mainField], '') + ); + + return displayedValue; +} + +export default useMainValue; From 7afa200622a5db85fe3a933d89f9b45acbbf4c7c Mon Sep 17 00:00:00 2001 From: godzzo Date: Tue, 1 Mar 2022 20:48:30 +0100 Subject: [PATCH 2/9] console.log removed, mainValue length limited to 50 chars, componentFieldName (string) parameter reorged to componentFieldPath (array) --- .../DynamicZone/components/Component/index.js | 14 ++------------ .../DynamicZone/components/Component/util.js | 10 ++++++---- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index d46055b96d..2396188c00 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -14,7 +14,6 @@ import { Loader } from '@strapi/design-system/Loader'; import Trash from '@strapi/icons/Trash'; import ArrowDown from '@strapi/icons/ArrowDown'; import ArrowUp from '@strapi/icons/ArrowUp'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { useContentTypeLayout } from '../../../../hooks'; import { getTrad } from '../../../../utils'; import FieldComponent from '../../../FieldComponent'; @@ -60,21 +59,12 @@ const Component = ({ }) => { const { formatMessage } = useIntl(); const { getComponentLayout } = useContentTypeLayout(); - const { modifiedData } = useCMEditViewDataManager(); const componentLayoutData = useMemo(() => { const layout = getComponentLayout(componentUid); - console.log('DZone/Component componentLayoutData', { - componentUid, - layout, - name, - index, - modifiedData, - }); - return layout; - }, [componentUid, getComponentLayout, index, name, modifiedData]); - const mainValue = useMainValue(componentLayoutData, `${name}.${index}`); + }, [componentUid, getComponentLayout]); + const mainValue = useMainValue(componentLayoutData, [name, index]); const { icon, friendlyName } = useMemo(() => { const { info: { icon, displayName }, diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js index 202f957dcb..a4930793af 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js @@ -2,13 +2,15 @@ import { useMemo } from 'react'; import { get, toString } from 'lodash'; import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -function useMainValue(schema, componentFieldName) { +function useMainValue(schema, componentFieldPath) { const { modifiedData } = useCMEditViewDataManager(); const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]); - const displayedValue = toString( - get(modifiedData, [...componentFieldName.split('.'), mainField], '') - ); + let displayedValue = toString(get(modifiedData, [...componentFieldPath, mainField], '')); + + if (displayedValue.length > 50) { + displayedValue = `${displayedValue.substring(0, 50)}...`; + } return displayedValue; } From 600df900f1699b0dbcbcde08ffe0aae41e74c7ac Mon Sep 17 00:00:00 2001 From: godzzo Date: Thu, 3 Mar 2022 07:12:42 +0100 Subject: [PATCH 3/9] decouple the getDisplayedValue logic for unit testing from useMainValue and add a unit test for it - without call the test. --- .../DynamicZone/components/Component/index.js | 2 +- .../utils/tests/getDisplayedValue.test.js | 19 +++++++++++++++++++ .../{util.js => utils/useMainValue.js} | 14 ++++++++++---- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/tests/getDisplayedValue.test.js rename packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/{util.js => utils/useMainValue.js} (75%) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index 2396188c00..cb7de160e2 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -18,7 +18,7 @@ import { useContentTypeLayout } from '../../../../hooks'; import { getTrad } from '../../../../utils'; import FieldComponent from '../../../FieldComponent'; import Rectangle from './Rectangle'; -import useMainValue from './util'; +import useMainValue from './utils/useMainValue'; const ActionStack = styled(Stack)` svg { diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/tests/getDisplayedValue.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/tests/getDisplayedValue.test.js new file mode 100644 index 0000000000..956fcbfe4c --- /dev/null +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/tests/getDisplayedValue.test.js @@ -0,0 +1,19 @@ +import { getDisplayedValue } from '../useMainValue'; + +describe('getDisplayedValue', () => { + it('returns the mainField value', () => { + const modifiedData = { + DeepComplex: [ + { + Title: 'File', + }, + ], + }; + const componentFieldPath = ['DeepComplex', 0]; + const mainField = 'Title'; + + const normalizedContent = getDisplayedValue(modifiedData, componentFieldPath, mainField); + + expect(normalizedContent).toEqual('File'); + }); +}); diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/useMainValue.js similarity index 75% rename from packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js rename to packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/useMainValue.js index a4930793af..9f0032544a 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/useMainValue.js @@ -2,10 +2,7 @@ import { useMemo } from 'react'; import { get, toString } from 'lodash'; import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -function useMainValue(schema, componentFieldPath) { - const { modifiedData } = useCMEditViewDataManager(); - - const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]); +export function getDisplayedValue(modifiedData, componentFieldPath, mainField) { let displayedValue = toString(get(modifiedData, [...componentFieldPath, mainField], '')); if (displayedValue.length > 50) { @@ -15,4 +12,13 @@ function useMainValue(schema, componentFieldPath) { return displayedValue; } +function useMainValue(schema, componentFieldPath) { + const { modifiedData } = useCMEditViewDataManager(); + + const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]); + let displayedValue = getDisplayedValue(modifiedData, componentFieldPath, mainField); + + return displayedValue; +} + export default useMainValue; From 20f7fedd9ce62f3ab925501923541868e74b68b8 Mon Sep 17 00:00:00 2001 From: godzzo Date: Tue, 29 Mar 2022 10:06:54 +0200 Subject: [PATCH 4/9] Remove length limit from displayedValue, and move useMainValue.js to the proper hooks/ folder. --- .../{utils => hooks}/tests/getDisplayedValue.test.js | 0 .../components/Component/{utils => hooks}/useMainValue.js | 8 +------- .../components/DynamicZone/components/Component/index.js | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) rename packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/{utils => hooks}/tests/getDisplayedValue.test.js (100%) rename packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/{utils => hooks}/useMainValue.js (71%) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/tests/getDisplayedValue.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/tests/getDisplayedValue.test.js similarity index 100% rename from packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/tests/getDisplayedValue.test.js rename to packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/tests/getDisplayedValue.test.js diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/useMainValue.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js similarity index 71% rename from packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/useMainValue.js rename to packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js index 9f0032544a..4c4ea7fdce 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/useMainValue.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js @@ -3,13 +3,7 @@ import { get, toString } from 'lodash'; import { useCMEditViewDataManager } from '@strapi/helper-plugin'; export function getDisplayedValue(modifiedData, componentFieldPath, mainField) { - let displayedValue = toString(get(modifiedData, [...componentFieldPath, mainField], '')); - - if (displayedValue.length > 50) { - displayedValue = `${displayedValue.substring(0, 50)}...`; - } - - return displayedValue; + return toString(get(modifiedData, [...componentFieldPath, mainField], '')); } function useMainValue(schema, componentFieldPath) { diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index cb7de160e2..2bae98b0bd 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -18,7 +18,7 @@ import { useContentTypeLayout } from '../../../../hooks'; import { getTrad } from '../../../../utils'; import FieldComponent from '../../../FieldComponent'; import Rectangle from './Rectangle'; -import useMainValue from './utils/useMainValue'; +import useMainValue from './hooks/useMainValue'; const ActionStack = styled(Stack)` svg { From 56607b684294e0b7f28a8df4c8840f53f60b6eb4 Mon Sep 17 00:00:00 2001 From: godzzo Date: Wed, 30 Mar 2022 08:16:35 +0200 Subject: [PATCH 5/9] adding wrapper (connect, select) for using mainValue as prop in DynamicZone/Component --- .../DynamicZone/components/Component/index.js | 18 ++++++++++-------- .../components/Component/utils/connect.js | 11 +++++++++++ .../components/Component/utils/index.js | 2 ++ .../components/Component/utils/select.js | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js create mode 100644 packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/index.js create mode 100644 packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/select.js diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index 2bae98b0bd..a32531f842 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -18,7 +18,7 @@ import { useContentTypeLayout } from '../../../../hooks'; import { getTrad } from '../../../../utils'; import FieldComponent from '../../../FieldComponent'; import Rectangle from './Rectangle'; -import useMainValue from './hooks/useMainValue'; +import { connect, select } from './utils'; const ActionStack = styled(Stack)` svg { @@ -56,15 +56,11 @@ const Component = ({ removeComponentFromDynamicZone, showDownIcon, showUpIcon, + // Passed with the select function + mainValue, }) => { const { formatMessage } = useIntl(); const { getComponentLayout } = useContentTypeLayout(); - const componentLayoutData = useMemo(() => { - const layout = getComponentLayout(componentUid); - - return layout; - }, [componentUid, getComponentLayout]); - const mainValue = useMainValue(componentLayoutData, [name, index]); const { icon, friendlyName } = useMemo(() => { const { info: { icon, displayName }, @@ -193,6 +189,12 @@ Component.propTypes = { removeComponentFromDynamicZone: PropTypes.func.isRequired, showDownIcon: PropTypes.bool.isRequired, showUpIcon: PropTypes.bool.isRequired, + mainValue: PropTypes.string.isRequired, }; -export default memo(Component, isEqual); +const Memoized = memo(Component, isEqual); + +export default connect( + Memoized, + select +); diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js new file mode 100644 index 0000000000..563d58b445 --- /dev/null +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js @@ -0,0 +1,11 @@ +import React from 'react'; + +function connect(WrappedComponent, select) { + return function(props) { + const selectors = select(props); + + return ; + }; +} + +export default connect; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/index.js new file mode 100644 index 0000000000..ba5c550759 --- /dev/null +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/index.js @@ -0,0 +1,2 @@ +export { default as connect } from './connect'; +export { default as select } from './select'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/select.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/select.js new file mode 100644 index 0000000000..d42ecee470 --- /dev/null +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/select.js @@ -0,0 +1,19 @@ +import { useMemo } from 'react'; +import useMainValue from '../hooks/useMainValue'; +import { useContentTypeLayout } from '../../../../../hooks'; + +function useSelect({ componentUid, name, index }) { + const { getComponentLayout } = useContentTypeLayout(); + const componentLayoutData = useMemo(() => { + const layout = getComponentLayout(componentUid); + + return layout; + }, [componentUid, getComponentLayout]); + const mainValue = useMainValue(componentLayoutData, [name, index]); + + return { + mainValue, + }; +} + +export default useSelect; From 20ccfeb2ace59365fc28ea6e8bdfe13cf6e2cdda Mon Sep 17 00:00:00 2001 From: Godzzo Date: Thu, 31 Mar 2022 14:34:32 +0200 Subject: [PATCH 6/9] separate imports for better tree shaking Co-authored-by: Gustav Hansen --- .../DynamicZone/components/Component/hooks/useMainValue.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js index 4c4ea7fdce..27f4f597d6 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js @@ -1,5 +1,6 @@ import { useMemo } from 'react'; -import { get, toString } from 'lodash'; +import get from 'lodash/get'; +import toString from 'lodash/toString'; import { useCMEditViewDataManager } from '@strapi/helper-plugin'; export function getDisplayedValue(modifiedData, componentFieldPath, mainField) { From 46851af65a3e16cd8dd2f194df99f960112c3003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gindilla=20P=C3=A9ter?= Date: Fri, 4 Nov 2022 13:26:48 +0100 Subject: [PATCH 7/9] fixing 'id' mainField (no title field), and empty display value not need separator. --- .../components/Component/hooks/useMainValue.js | 13 ++++++++++--- .../DynamicZone/components/Component/index.js | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js index 27f4f597d6..0cf6ee5309 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js @@ -10,10 +10,17 @@ export function getDisplayedValue(modifiedData, componentFieldPath, mainField) { function useMainValue(schema, componentFieldPath) { const { modifiedData } = useCMEditViewDataManager(); - const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]); - let displayedValue = getDisplayedValue(modifiedData, componentFieldPath, mainField); + const mainField = useMemo( + () => get(schema, ["settings", "mainField"], "id"), + [schema] + ); - return displayedValue; + const displayedValue = + mainField === "id" + ? "" + : getDisplayedValue(modifiedData, componentFieldPath, mainField); + + return displayedValue.trim().length < 1 ? "" : ` - ${displayedValue}`; } export default useMainValue; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index a32531f842..5fb7c6997c 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -147,7 +147,7 @@ const Component = ({ )} } - title={`${friendlyName} - ${mainValue}`} + title={`${friendlyName}${mainValue}`} togglePosition="left" /> From 9b2d5b0e6fc6bfa2fb50424b078df6d72eb705d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gindilla=20P=C3=A9ter?= Date: Fri, 4 Nov 2022 13:44:30 +0100 Subject: [PATCH 8/9] fixing format issues (lint (node: 18)) --- .../components/Component/hooks/useMainValue.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js index 0cf6ee5309..547e418794 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js @@ -10,17 +10,12 @@ export function getDisplayedValue(modifiedData, componentFieldPath, mainField) { function useMainValue(schema, componentFieldPath) { const { modifiedData } = useCMEditViewDataManager(); - const mainField = useMemo( - () => get(schema, ["settings", "mainField"], "id"), - [schema] - ); + const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]); const displayedValue = - mainField === "id" - ? "" - : getDisplayedValue(modifiedData, componentFieldPath, mainField); + mainField === 'id' ? '' : getDisplayedValue(modifiedData, componentFieldPath, mainField); - return displayedValue.trim().length < 1 ? "" : ` - ${displayedValue}`; + return displayedValue.trim().length < 1 ? '' : ` - ${displayedValue}`; } export default useMainValue; From ab1d9e66b3005e5309b7ccf28e29a23155538f06 Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Fri, 11 Nov 2022 13:10:56 +0100 Subject: [PATCH 9/9] Chore: Fix eslint errors --- .../components/DynamicZone/components/Component/index.js | 5 +---- .../DynamicZone/components/Component/utils/connect.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js index 5fb7c6997c..37d47e897c 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js @@ -194,7 +194,4 @@ Component.propTypes = { const Memoized = memo(Component, isEqual); -export default connect( - Memoized, - select -); +export default connect(Memoized, select); diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js index 563d58b445..f763338c32 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return (props) => { const selectors = select(props); return ;