@contentful/field-editor-rich-text 3.16.8 → 3.16.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/ContentfulEditorProvider.js +8 -8
- package/dist/cjs/RichTextEditor.js +20 -22
- package/dist/cjs/RichTextEditor.styles.js +1 -2
- package/dist/cjs/SdkProvider.js +5 -7
- package/dist/cjs/SyncEditorChanges.js +6 -15
- package/dist/cjs/Toolbar/_tests_/toolbar.test.js +15 -17
- package/dist/cjs/Toolbar/components/EmbedEntityWidget.js +9 -13
- package/dist/cjs/Toolbar/components/EmbeddedEntityDropdownButton.js +8 -10
- package/dist/cjs/Toolbar/components/StickyToolbarWrapper.js +2 -2
- package/dist/cjs/Toolbar/index.js +30 -33
- package/dist/cjs/__fixtures__/FakeSdk.js +3 -3
- package/dist/cjs/__fixtures__/asset/index.js +10 -10
- package/dist/cjs/__fixtures__/content-type/index.js +1 -1
- package/dist/cjs/__fixtures__/entry/index.js +7 -7
- package/dist/cjs/__fixtures__/fixtures.js +6 -8
- package/dist/cjs/__fixtures__/locale/index.js +2 -2
- package/dist/cjs/__fixtures__/space/index.js +1 -1
- package/dist/cjs/constants/Schema.js +0 -1
- package/dist/cjs/dialogs/HypelinkDialog/HyperlinkDialog.js +38 -43
- package/dist/cjs/dialogs/openRichTextDialog.js +4 -6
- package/dist/cjs/dialogs/renderRichTextDialog.js +4 -6
- package/dist/cjs/helpers/__tests__/removeInternalMarks.test.js +10 -10
- package/dist/cjs/helpers/callbacks.js +3 -3
- package/dist/cjs/helpers/config.js +2 -2
- package/dist/cjs/helpers/editor.js +44 -53
- package/dist/cjs/helpers/environment.js +3 -3
- package/dist/cjs/helpers/formatDateAndTime.js +4 -5
- package/dist/cjs/helpers/getAllowedResourcesForNodeType.js +5 -22
- package/dist/cjs/helpers/getLinkedContentTypeIdsForNodeType.js +5 -29
- package/dist/cjs/helpers/nodeFactory.js +6 -6
- package/dist/cjs/helpers/sdkNavigatorSlideIn.js +6 -14
- package/dist/cjs/helpers/sdkNavigatorSlideIn.spec.js +2 -3
- package/dist/cjs/helpers/toSlateValue.js +3 -14
- package/dist/cjs/helpers/transformers.js +5 -5
- package/dist/cjs/helpers/validations.js +9 -12
- package/dist/cjs/index.js +5 -7
- package/dist/cjs/internal/constants.js +2 -4
- package/dist/cjs/internal/hooks.js +7 -9
- package/dist/cjs/internal/misc.js +12 -15
- package/dist/cjs/internal/queries.js +108 -115
- package/dist/cjs/internal/transforms.js +48 -51
- package/dist/cjs/internal/types/editor.js +1 -3
- package/dist/cjs/plugins/Break/createExitBreakPlugin.test.js +3 -4
- package/dist/cjs/plugins/Break/createResetNodePlugin.js +0 -1
- package/dist/cjs/plugins/Break/createSoftBreakPlugin.test.js +3 -3
- package/dist/cjs/plugins/CommandPalette/components/CommandList.js +33 -35
- package/dist/cjs/plugins/CommandPalette/components/CommandList.styles.js +1 -1
- package/dist/cjs/plugins/CommandPalette/components/CommandPrompt.js +5 -7
- package/dist/cjs/plugins/CommandPalette/hooks/useCommandList.js +3 -7
- package/dist/cjs/plugins/CommandPalette/onKeyDown.js +1 -6
- package/dist/cjs/plugins/CommandPalette/onKeyDown.spec.js +4 -6
- package/dist/cjs/plugins/CommandPalette/useCommands.js +3 -3
- package/dist/cjs/plugins/CommandPalette/utils/fetchEntries.js +0 -2
- package/dist/cjs/plugins/CommandPalette/utils/trimLeadingSlash.js +1 -6
- package/dist/cjs/plugins/DragAndDrop/index.js +1 -9
- package/dist/cjs/plugins/EmbeddedEntityBlock/LinkedEntityBlock.js +8 -10
- package/dist/cjs/plugins/EmbeddedEntityBlock/index.js +3 -3
- package/dist/cjs/plugins/EmbeddedEntityInline/FetchingWrappedInlineEntryCard.js +17 -19
- package/dist/cjs/plugins/EmbeddedEntityInline/LinkedEntityInline.js +7 -9
- package/dist/cjs/plugins/EmbeddedResourceBlock/LinkedResourceBlock.js +5 -5
- package/dist/cjs/plugins/EmbeddedResourceInline/FetchingWrappedResourceInlineCard.js +11 -13
- package/dist/cjs/plugins/EmbeddedResourceInline/LinkedResourceInline.js +5 -5
- package/dist/cjs/plugins/Heading/__tests__/createHeadingPlugin.test.js +32 -32
- package/dist/cjs/plugins/Heading/components/Heading.js +10 -13
- package/dist/cjs/plugins/Heading/components/ToolbarHeadingButton.js +29 -23
- package/dist/cjs/plugins/Heading/createHeadingPlugin.js +2 -7
- package/dist/cjs/plugins/Hr/index.js +14 -19
- package/dist/cjs/plugins/Hyperlink/HyperlinkModal.js +28 -32
- package/dist/cjs/plugins/Hyperlink/__tests__/createHyperlinkPlugin.test.js +8 -8
- package/dist/cjs/plugins/Hyperlink/components/EntityHyperlink.js +8 -10
- package/dist/cjs/plugins/Hyperlink/components/LinkPopover.js +17 -23
- package/dist/cjs/plugins/Hyperlink/components/ResourceHyperlink.js +8 -10
- package/dist/cjs/plugins/Hyperlink/components/ToolbarHyperlinkButton.js +4 -6
- package/dist/cjs/plugins/Hyperlink/components/UrlHyperlink.js +6 -8
- package/dist/cjs/plugins/Hyperlink/components/linkHandlers.js +3 -3
- package/dist/cjs/plugins/Hyperlink/components/styles.js +1 -1
- package/dist/cjs/plugins/Hyperlink/createHyperlinkPlugin.js +4 -10
- package/dist/cjs/plugins/Hyperlink/useEntityInfo.js +3 -6
- package/dist/cjs/plugins/Hyperlink/useResourceEntityInfo.js +4 -6
- package/dist/cjs/plugins/Hyperlink/utils.js +4 -4
- package/dist/cjs/plugins/List/__tests__/createListPlugin.test.js +13 -13
- package/dist/cjs/plugins/List/__tests__/insertListBreak.test.js +25 -29
- package/dist/cjs/plugins/List/__tests__/insertListFragment.test.js +22 -22
- package/dist/cjs/plugins/List/components/List.js +7 -9
- package/dist/cjs/plugins/List/components/ListItem.js +4 -6
- package/dist/cjs/plugins/List/components/ToolbarListButton.js +5 -7
- package/dist/cjs/plugins/List/createListPlugin.js +0 -4
- package/dist/cjs/plugins/List/insertListBreak.js +4 -13
- package/dist/cjs/plugins/List/insertListFragment.js +5 -18
- package/dist/cjs/plugins/List/onKeyDownList.js +6 -8
- package/dist/cjs/plugins/List/transforms/insertListItem.js +2 -17
- package/dist/cjs/plugins/List/transforms/moveListItemDown.js +2 -8
- package/dist/cjs/plugins/List/transforms/moveListItems.js +2 -7
- package/dist/cjs/plugins/List/transforms/moveListItems.test.js +14 -15
- package/dist/cjs/plugins/List/transforms/toggleList.js +3 -8
- package/dist/cjs/plugins/List/transforms/toggleList.spec.js +28 -28
- package/dist/cjs/plugins/List/transforms/unwrapList.js +2 -7
- package/dist/cjs/plugins/List/utils.js +11 -12
- package/dist/cjs/plugins/List/withList.js +2 -6
- package/dist/cjs/plugins/Marks/Bold.js +7 -9
- package/dist/cjs/plugins/Marks/Code.js +7 -15
- package/dist/cjs/plugins/Marks/Italic.js +7 -9
- package/dist/cjs/plugins/Marks/Subscript.js +8 -10
- package/dist/cjs/plugins/Marks/Superscript.js +8 -10
- package/dist/cjs/plugins/Marks/Underline.js +4 -6
- package/dist/cjs/plugins/Marks/components/MarkToolbarButton.js +7 -9
- package/dist/cjs/plugins/Marks/helpers.js +5 -5
- package/dist/cjs/plugins/Normalizer/baseRules.js +0 -2
- package/dist/cjs/plugins/Normalizer/createNormalizerPlugin.test.js +12 -12
- package/dist/cjs/plugins/Normalizer/utils.js +3 -4
- package/dist/cjs/plugins/Normalizer/withNormalizer.js +3 -23
- package/dist/cjs/plugins/Paragraph/Paragraph.js +4 -6
- package/dist/cjs/plugins/Paragraph/__tests__/createParagraphPlugin.test.js +32 -32
- package/dist/cjs/plugins/Paragraph/createParagraphPlugin.js +2 -3
- package/dist/cjs/plugins/PasteHTML/createPasteHTMLPlugin.js +6 -9
- package/dist/cjs/plugins/PasteHTML/utils/__tests__/sanitizeHTML.test.js +0 -2
- package/dist/cjs/plugins/PasteHTML/utils/sanitizeAnchors.js +0 -9
- package/dist/cjs/plugins/PasteHTML/utils/sanitizeHTML.js +2 -17
- package/dist/cjs/plugins/PasteHTML/utils/sanitizeSheets.js +1 -13
- package/dist/cjs/plugins/Quote/__test__/createQuotePlugin.test.js +21 -21
- package/dist/cjs/plugins/Quote/components/Quote.js +4 -6
- package/dist/cjs/plugins/Quote/components/ToolbarQuoteButton.js +4 -6
- package/dist/cjs/plugins/Quote/createQuotePlugin.js +0 -1
- package/dist/cjs/plugins/Quote/toggleQuote.js +5 -5
- package/dist/cjs/plugins/Quote/withQuote.js +2 -4
- package/dist/cjs/plugins/SelectOnBackspace/createSelectOnBackspacePlugin.js +0 -1
- package/dist/cjs/plugins/Table/__tests__/createTablePlugin.test.js +22 -22
- package/dist/cjs/plugins/Table/__tests__/helpers.test.js +4 -4
- package/dist/cjs/plugins/Table/actions/addColumn.js +4 -5
- package/dist/cjs/plugins/Table/actions/addRow.js +3 -6
- package/dist/cjs/plugins/Table/components/Cell.js +5 -7
- package/dist/cjs/plugins/Table/components/HeaderCell.js +5 -7
- package/dist/cjs/plugins/Table/components/Row.js +4 -6
- package/dist/cjs/plugins/Table/components/Table.js +6 -8
- package/dist/cjs/plugins/Table/components/TableActions.js +16 -19
- package/dist/cjs/plugins/Table/components/ToolbarButton.js +4 -7
- package/dist/cjs/plugins/Table/createTablePlugin.js +1 -11
- package/dist/cjs/plugins/Table/helpers.js +12 -16
- package/dist/cjs/plugins/Table/insertTableFragment.js +2 -15
- package/dist/cjs/plugins/Table/onKeyDownTable.js +2 -11
- package/dist/cjs/plugins/Table/tableTracking.js +6 -6
- package/dist/cjs/plugins/Text/__tests__/createTextPlugin.test.js +17 -19
- package/dist/cjs/plugins/Text/createTextPlugin.js +5 -22
- package/dist/cjs/plugins/Tracking/createTrackingPlugin.js +4 -5
- package/dist/cjs/plugins/Tracking/utils.js +3 -6
- package/dist/cjs/plugins/Voids/createVoidsPlugin.js +0 -5
- package/dist/cjs/plugins/Voids/transformVoid.js +0 -1
- package/dist/cjs/plugins/index.js +3 -15
- package/dist/cjs/plugins/shared/EmbeddedBlockToolbarIcon.js +10 -12
- package/dist/cjs/plugins/shared/EmbeddedBlockUtil.js +6 -16
- package/dist/cjs/plugins/shared/EmbeddedInlineToolbarIcon.js +8 -10
- package/dist/cjs/plugins/shared/EmbeddedInlineUtil.js +5 -9
- package/dist/cjs/plugins/shared/FetchingWrappedAssetCard.js +11 -13
- package/dist/cjs/plugins/shared/FetchingWrappedEntryCard.js +12 -14
- package/dist/cjs/plugins/shared/FetchingWrappedResourceCard.js +11 -14
- package/dist/cjs/plugins/shared/LinkedBlockWrapper.js +4 -8
- package/dist/cjs/plugins/shared/LinkedInlineWrapper.js +6 -10
- package/dist/cjs/plugins/shared/ResourceNewBadge.js +3 -5
- package/dist/cjs/plugins/shared/ToolbarButton.js +6 -8
- package/dist/cjs/plugins/shared/__tests__/FetchingWrappedAssetCard.test.js +5 -10
- package/dist/cjs/plugins/shared/__tests__/FetchingWrappedEntryCard.test.js +6 -11
- package/dist/cjs/plugins/shared/__tests__/FetchingWrappedResourceCard.test.js +13 -15
- package/dist/cjs/plugins/shared/utils.js +1 -4
- package/dist/cjs/test-utils/assertOutput.js +0 -1
- package/dist/cjs/test-utils/hyperscript.d.js +0 -1
- package/dist/cjs/test-utils/randomId.js +1 -3
- package/dist/cjs/test-utils/validation.js +5 -8
- package/dist/esm/ContentfulEditorProvider.js +1 -4
- package/dist/esm/RichTextEditor.js +13 -13
- package/dist/esm/RichTextEditor.styles.js +0 -1
- package/dist/esm/SdkProvider.js +2 -2
- package/dist/esm/SyncEditorChanges.js +3 -18
- package/dist/esm/Toolbar/_tests_/toolbar.test.js +12 -12
- package/dist/esm/Toolbar/components/EmbedEntityWidget.js +7 -9
- package/dist/esm/Toolbar/components/EmbeddedEntityDropdownButton.js +6 -6
- package/dist/esm/Toolbar/components/StickyToolbarWrapper.js +1 -1
- package/dist/esm/Toolbar/index.js +27 -28
- package/dist/esm/__fixtures__/FakeSdk.js +3 -3
- package/dist/esm/constants/Schema.js +0 -1
- package/dist/esm/dialogs/HypelinkDialog/HyperlinkDialog.js +31 -34
- package/dist/esm/dialogs/openRichTextDialog.js +2 -2
- package/dist/esm/dialogs/renderRichTextDialog.js +2 -2
- package/dist/esm/helpers/__tests__/removeInternalMarks.test.js +10 -10
- package/dist/esm/helpers/callbacks.js +1 -1
- package/dist/esm/helpers/config.js +1 -9
- package/dist/esm/helpers/editor.js +6 -22
- package/dist/esm/helpers/extractNodes.js +1 -3
- package/dist/esm/helpers/formatDateAndTime.js +2 -11
- package/dist/esm/helpers/getAllowedResourcesForNodeType.js +2 -19
- package/dist/esm/helpers/getLinkedContentTypeIdsForNodeType.js +2 -26
- package/dist/esm/helpers/sdkNavigatorSlideIn.js +6 -20
- package/dist/esm/helpers/sdkNavigatorSlideIn.spec.js +0 -1
- package/dist/esm/helpers/toSlateValue.js +3 -17
- package/dist/esm/helpers/validations.js +1 -5
- package/dist/esm/internal/misc.js +2 -23
- package/dist/esm/internal/queries.js +2 -11
- package/dist/esm/internal/transforms.js +3 -14
- package/dist/esm/internal/types/editor.js +1 -3
- package/dist/esm/plugins/Break/createExitBreakPlugin.test.js +3 -4
- package/dist/esm/plugins/Break/createResetNodePlugin.js +0 -1
- package/dist/esm/plugins/Break/createSoftBreakPlugin.test.js +3 -3
- package/dist/esm/plugins/CommandPalette/components/CommandList.js +30 -30
- package/dist/esm/plugins/CommandPalette/components/CommandPrompt.js +2 -2
- package/dist/esm/plugins/CommandPalette/createCommandPalettePlugin.js +1 -11
- package/dist/esm/plugins/CommandPalette/hooks/useCommandList.js +0 -2
- package/dist/esm/plugins/CommandPalette/onKeyDown.js +0 -5
- package/dist/esm/plugins/CommandPalette/onKeyDown.spec.js +2 -2
- package/dist/esm/plugins/CommandPalette/useCommands.js +3 -3
- package/dist/esm/plugins/CommandPalette/utils/fetchEntries.js +0 -2
- package/dist/esm/plugins/CommandPalette/utils/trimLeadingSlash.js +1 -6
- package/dist/esm/plugins/DragAndDrop/index.js +1 -9
- package/dist/esm/plugins/EmbeddedEntityBlock/LinkedEntityBlock.js +6 -6
- package/dist/esm/plugins/EmbeddedEntityInline/FetchingWrappedInlineEntryCard.js +14 -14
- package/dist/esm/plugins/EmbeddedEntityInline/LinkedEntityInline.js +5 -5
- package/dist/esm/plugins/EmbeddedResourceBlock/LinkedResourceBlock.js +4 -4
- package/dist/esm/plugins/EmbeddedResourceInline/FetchingWrappedResourceInlineCard.js +9 -9
- package/dist/esm/plugins/EmbeddedResourceInline/LinkedResourceInline.js +4 -4
- package/dist/esm/plugins/Heading/__tests__/createHeadingPlugin.test.js +32 -32
- package/dist/esm/plugins/Heading/components/Heading.js +7 -8
- package/dist/esm/plugins/Heading/components/ToolbarHeadingButton.js +26 -18
- package/dist/esm/plugins/Heading/createHeadingPlugin.js +1 -6
- package/dist/esm/plugins/Hr/index.js +5 -8
- package/dist/esm/plugins/Hyperlink/HyperlinkModal.js +23 -25
- package/dist/esm/plugins/Hyperlink/__tests__/createHyperlinkPlugin.test.js +8 -8
- package/dist/esm/plugins/Hyperlink/components/EntityHyperlink.js +6 -6
- package/dist/esm/plugins/Hyperlink/components/LinkPopover.js +15 -19
- package/dist/esm/plugins/Hyperlink/components/ResourceHyperlink.js +6 -6
- package/dist/esm/plugins/Hyperlink/components/ToolbarHyperlinkButton.js +2 -2
- package/dist/esm/plugins/Hyperlink/components/UrlHyperlink.js +4 -4
- package/dist/esm/plugins/Hyperlink/createHyperlinkPlugin.js +1 -5
- package/dist/esm/plugins/Hyperlink/useEntityInfo.js +3 -6
- package/dist/esm/plugins/Hyperlink/useResourceEntityInfo.js +2 -2
- package/dist/esm/plugins/Hyperlink/utils.js +1 -1
- package/dist/esm/plugins/List/__tests__/createListPlugin.test.js +13 -13
- package/dist/esm/plugins/List/__tests__/insertListBreak.test.js +25 -29
- package/dist/esm/plugins/List/__tests__/insertListFragment.test.js +22 -22
- package/dist/esm/plugins/List/components/List.js +1 -1
- package/dist/esm/plugins/List/components/ListItem.js +1 -1
- package/dist/esm/plugins/List/components/ToolbarListButton.js +3 -3
- package/dist/esm/plugins/List/createListPlugin.js +0 -4
- package/dist/esm/plugins/List/insertListBreak.js +4 -13
- package/dist/esm/plugins/List/insertListFragment.js +5 -18
- package/dist/esm/plugins/List/onKeyDownList.js +5 -7
- package/dist/esm/plugins/List/transforms/insertListItem.js +3 -20
- package/dist/esm/plugins/List/transforms/moveListItemDown.js +2 -8
- package/dist/esm/plugins/List/transforms/moveListItems.js +2 -7
- package/dist/esm/plugins/List/transforms/moveListItems.test.js +14 -15
- package/dist/esm/plugins/List/transforms/toggleList.js +3 -8
- package/dist/esm/plugins/List/transforms/toggleList.spec.js +28 -28
- package/dist/esm/plugins/List/transforms/unwrapList.js +2 -7
- package/dist/esm/plugins/List/utils.js +2 -7
- package/dist/esm/plugins/List/withList.js +2 -6
- package/dist/esm/plugins/Marks/Bold.js +2 -2
- package/dist/esm/plugins/Marks/Code.js +2 -8
- package/dist/esm/plugins/Marks/Italic.js +2 -2
- package/dist/esm/plugins/Marks/Subscript.js +2 -2
- package/dist/esm/plugins/Marks/Superscript.js +2 -2
- package/dist/esm/plugins/Marks/Underline.js +2 -2
- package/dist/esm/plugins/Marks/components/MarkToolbarButton.js +4 -4
- package/dist/esm/plugins/Marks/helpers.js +1 -1
- package/dist/esm/plugins/Normalizer/baseRules.js +0 -4
- package/dist/esm/plugins/Normalizer/createNormalizerPlugin.test.js +12 -12
- package/dist/esm/plugins/Normalizer/utils.js +0 -1
- package/dist/esm/plugins/Normalizer/withNormalizer.js +2 -22
- package/dist/esm/plugins/Paragraph/Paragraph.js +1 -1
- package/dist/esm/plugins/Paragraph/__tests__/createParagraphPlugin.test.js +32 -32
- package/dist/esm/plugins/Paragraph/createParagraphPlugin.js +1 -2
- package/dist/esm/plugins/PasteHTML/createPasteHTMLPlugin.js +3 -9
- package/dist/esm/plugins/PasteHTML/utils/__tests__/sanitizeHTML.test.js +0 -2
- package/dist/esm/plugins/PasteHTML/utils/sanitizeAnchors.js +1 -27
- package/dist/esm/plugins/PasteHTML/utils/sanitizeHTML.js +2 -17
- package/dist/esm/plugins/PasteHTML/utils/sanitizeSheets.js +1 -13
- package/dist/esm/plugins/Quote/__test__/createQuotePlugin.test.js +21 -21
- package/dist/esm/plugins/Quote/components/Quote.js +1 -1
- package/dist/esm/plugins/Quote/components/ToolbarQuoteButton.js +2 -2
- package/dist/esm/plugins/Quote/createQuotePlugin.js +0 -1
- package/dist/esm/plugins/Quote/shouldResetQuote.js +1 -6
- package/dist/esm/plugins/Quote/toggleQuote.js +1 -1
- package/dist/esm/plugins/Quote/withQuote.js +2 -4
- package/dist/esm/plugins/SelectOnBackspace/createSelectOnBackspacePlugin.js +0 -1
- package/dist/esm/plugins/Table/__tests__/createTablePlugin.test.js +22 -22
- package/dist/esm/plugins/Table/__tests__/helpers.test.js +4 -4
- package/dist/esm/plugins/Table/actions/addColumn.js +1 -2
- package/dist/esm/plugins/Table/actions/addRow.js +0 -3
- package/dist/esm/plugins/Table/components/Cell.js +2 -2
- package/dist/esm/plugins/Table/components/HeaderCell.js +2 -2
- package/dist/esm/plugins/Table/components/Row.js +1 -1
- package/dist/esm/plugins/Table/components/Table.js +3 -3
- package/dist/esm/plugins/Table/components/TableActions.js +11 -12
- package/dist/esm/plugins/Table/components/ToolbarButton.js +2 -3
- package/dist/esm/plugins/Table/createTablePlugin.js +1 -11
- package/dist/esm/plugins/Table/helpers.js +1 -10
- package/dist/esm/plugins/Table/insertTableFragment.js +2 -15
- package/dist/esm/plugins/Table/onKeyDownTable.js +2 -11
- package/dist/esm/plugins/Table/tableTracking.js +6 -6
- package/dist/esm/plugins/Text/__tests__/createTextPlugin.test.js +17 -19
- package/dist/esm/plugins/Text/createTextPlugin.js +5 -22
- package/dist/esm/plugins/Tracking/createTrackingPlugin.js +1 -2
- package/dist/esm/plugins/Tracking/utils.js +0 -1
- package/dist/esm/plugins/Voids/createVoidsPlugin.js +0 -5
- package/dist/esm/plugins/Voids/transformVoid.js +1 -4
- package/dist/esm/plugins/index.js +0 -12
- package/dist/esm/plugins/shared/EmbeddedBlockToolbarIcon.js +5 -5
- package/dist/esm/plugins/shared/EmbeddedBlockUtil.js +5 -15
- package/dist/esm/plugins/shared/EmbeddedInlineToolbarIcon.js +5 -5
- package/dist/esm/plugins/shared/EmbeddedInlineUtil.js +4 -8
- package/dist/esm/plugins/shared/FetchingWrappedAssetCard.js +8 -8
- package/dist/esm/plugins/shared/FetchingWrappedEntryCard.js +9 -9
- package/dist/esm/plugins/shared/FetchingWrappedResourceCard.js +8 -9
- package/dist/esm/plugins/shared/LinkedBlockWrapper.js +3 -7
- package/dist/esm/plugins/shared/LinkedInlineWrapper.js +3 -5
- package/dist/esm/plugins/shared/ResourceNewBadge.js +1 -1
- package/dist/esm/plugins/shared/ToolbarButton.js +3 -3
- package/dist/esm/plugins/shared/__tests__/FetchingWrappedAssetCard.test.js +2 -5
- package/dist/esm/plugins/shared/__tests__/FetchingWrappedEntryCard.test.js +2 -5
- package/dist/esm/plugins/shared/__tests__/FetchingWrappedResourceCard.test.js +8 -8
- package/dist/esm/plugins/shared/utils.js +1 -4
- package/dist/esm/test-utils/assertOutput.js +0 -1
- package/dist/esm/test-utils/hyperscript.d.js +0 -1
- package/dist/esm/test-utils/jsx.js +1 -5
- package/dist/esm/test-utils/randomId.js +1 -3
- package/dist/esm/test-utils/setEmptyDataAttribute.js +1 -4
- package/dist/esm/test-utils/validation.js +4 -7
- package/dist/types/RichTextEditor.d.ts +2 -3
- package/dist/types/Toolbar/components/EmbedEntityWidget.d.ts +1 -2
- package/dist/types/Toolbar/components/EmbeddedEntityDropdownButton.d.ts +1 -1
- package/dist/types/Toolbar/components/StickyToolbarWrapper.d.ts +2 -2
- package/dist/types/Toolbar/index.d.ts +1 -2
- package/dist/types/dialogs/HypelinkDialog/HyperlinkDialog.d.ts +4 -4
- package/dist/types/dialogs/renderRichTextDialog.d.ts +1 -2
- package/dist/types/plugins/CommandPalette/components/CommandList.d.ts +1 -2
- package/dist/types/plugins/CommandPalette/components/CommandPrompt.d.ts +1 -2
- package/dist/types/plugins/EmbeddedEntityBlock/LinkedEntityBlock.d.ts +1 -2
- package/dist/types/plugins/EmbeddedEntityInline/FetchingWrappedInlineEntryCard.d.ts +1 -1
- package/dist/types/plugins/EmbeddedEntityInline/LinkedEntityInline.d.ts +1 -2
- package/dist/types/plugins/EmbeddedResourceBlock/LinkedResourceBlock.d.ts +1 -2
- package/dist/types/plugins/EmbeddedResourceInline/FetchingWrappedResourceInlineCard.d.ts +1 -1
- package/dist/types/plugins/EmbeddedResourceInline/LinkedResourceInline.d.ts +1 -2
- package/dist/types/plugins/Heading/components/Heading.d.ts +6 -6
- package/dist/types/plugins/Heading/components/ToolbarHeadingButton.d.ts +1 -2
- package/dist/types/plugins/Hr/index.d.ts +2 -2
- package/dist/types/plugins/Hyperlink/HyperlinkModal.d.ts +1 -2
- package/dist/types/plugins/Hyperlink/components/EntityHyperlink.d.ts +1 -2
- package/dist/types/plugins/Hyperlink/components/LinkPopover.d.ts +1 -1
- package/dist/types/plugins/Hyperlink/components/ResourceHyperlink.d.ts +1 -2
- package/dist/types/plugins/Hyperlink/components/ToolbarHyperlinkButton.d.ts +1 -2
- package/dist/types/plugins/Hyperlink/components/UrlHyperlink.d.ts +1 -2
- package/dist/types/plugins/List/components/List.d.ts +2 -3
- package/dist/types/plugins/List/components/ListItem.d.ts +1 -2
- package/dist/types/plugins/List/components/ToolbarListButton.d.ts +1 -2
- package/dist/types/plugins/Marks/Bold.d.ts +2 -3
- package/dist/types/plugins/Marks/Code.d.ts +3 -4
- package/dist/types/plugins/Marks/Italic.d.ts +2 -3
- package/dist/types/plugins/Marks/Subscript.d.ts +3 -4
- package/dist/types/plugins/Marks/Superscript.d.ts +3 -4
- package/dist/types/plugins/Marks/Underline.d.ts +2 -3
- package/dist/types/plugins/Marks/components/MarkToolbarButton.d.ts +1 -1
- package/dist/types/plugins/Paragraph/Paragraph.d.ts +1 -2
- package/dist/types/plugins/Quote/components/Quote.d.ts +1 -2
- package/dist/types/plugins/Quote/components/ToolbarQuoteButton.d.ts +1 -2
- package/dist/types/plugins/Table/components/Cell.d.ts +1 -2
- package/dist/types/plugins/Table/components/HeaderCell.d.ts +1 -2
- package/dist/types/plugins/Table/components/Row.d.ts +1 -2
- package/dist/types/plugins/Table/components/Table.d.ts +1 -2
- package/dist/types/plugins/Table/components/TableActions.d.ts +1 -2
- package/dist/types/plugins/Table/components/ToolbarButton.d.ts +1 -2
- package/dist/types/plugins/shared/EmbeddedBlockToolbarIcon.d.ts +1 -2
- package/dist/types/plugins/shared/EmbeddedInlineToolbarIcon.d.ts +1 -2
- package/dist/types/plugins/shared/FetchingWrappedAssetCard.d.ts +1 -2
- package/dist/types/plugins/shared/FetchingWrappedEntryCard.d.ts +1 -2
- package/dist/types/plugins/shared/FetchingWrappedResourceCard.d.ts +1 -2
- package/dist/types/plugins/shared/LinkedBlockWrapper.d.ts +1 -1
- package/dist/types/plugins/shared/LinkedInlineWrapper.d.ts +1 -1
- package/dist/types/plugins/shared/ResourceNewBadge.d.ts +1 -2
- package/dist/types/plugins/shared/ToolbarButton.d.ts +1 -2
- package/package.json +8 -5
|
@@ -9,13 +9,13 @@ import { useLinkTracking } from '../links-tracking';
|
|
|
9
9
|
import { LinkedInlineWrapper } from '../shared/LinkedInlineWrapper';
|
|
10
10
|
import { FetchingWrappedInlineEntryCard } from './FetchingWrappedInlineEntryCard';
|
|
11
11
|
export function LinkedEntityInline(props) {
|
|
12
|
-
const { attributes, children, element
|
|
13
|
-
const { onEntityFetchComplete
|
|
12
|
+
const { attributes , children , element } = props;
|
|
13
|
+
const { onEntityFetchComplete } = useLinkTracking();
|
|
14
14
|
const isSelected = useSelected();
|
|
15
15
|
const editor = useContentfulEditor();
|
|
16
16
|
const sdk = useSdkContext();
|
|
17
17
|
const isDisabled = useReadOnly();
|
|
18
|
-
const { id: entryId
|
|
18
|
+
const { id: entryId } = element.data.target.sys;
|
|
19
19
|
function handleEditClick() {
|
|
20
20
|
return sdk.navigator.openEntry(entryId, {
|
|
21
21
|
slideIn: {
|
|
@@ -32,9 +32,9 @@ export function LinkedEntityInline(props) {
|
|
|
32
32
|
at: pathToElement
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
return
|
|
35
|
+
return React.createElement(LinkedInlineWrapper, {
|
|
36
36
|
attributes: attributes,
|
|
37
|
-
card:
|
|
37
|
+
card: React.createElement(FetchingWrappedInlineEntryCard, {
|
|
38
38
|
sdk: sdk,
|
|
39
39
|
entryId: entryId,
|
|
40
40
|
isSelected: isSelected,
|
|
@@ -7,8 +7,8 @@ import { useLinkTracking } from '../links-tracking';
|
|
|
7
7
|
import { FetchingWrappedResourceCard } from '../shared/FetchingWrappedResourceCard';
|
|
8
8
|
import { LinkedBlockWrapper } from '../shared/LinkedBlockWrapper';
|
|
9
9
|
export function LinkedResourceBlock(props) {
|
|
10
|
-
const { attributes, children, element
|
|
11
|
-
const { onEntityFetchComplete
|
|
10
|
+
const { attributes , children , element } = props;
|
|
11
|
+
const { onEntityFetchComplete } = useLinkTracking();
|
|
12
12
|
const isSelected = useSelected();
|
|
13
13
|
const editor = useContentfulEditor();
|
|
14
14
|
const sdk = useSdkContext();
|
|
@@ -24,10 +24,10 @@ export function LinkedResourceBlock(props) {
|
|
|
24
24
|
editor,
|
|
25
25
|
element
|
|
26
26
|
]);
|
|
27
|
-
return
|
|
27
|
+
return React.createElement(LinkedBlockWrapper, {
|
|
28
28
|
attributes: attributes,
|
|
29
29
|
link: element.data.target,
|
|
30
|
-
card:
|
|
30
|
+
card: React.createElement(FetchingWrappedResourceCard, {
|
|
31
31
|
sdk: sdk,
|
|
32
32
|
link: link,
|
|
33
33
|
isDisabled: isDisabled,
|
|
@@ -4,10 +4,10 @@ import { useResource } from '@contentful/field-editor-reference';
|
|
|
4
4
|
import { entityHelpers } from '@contentful/field-editor-shared';
|
|
5
5
|
import { INLINES } from '@contentful/rich-text-types';
|
|
6
6
|
import { truncateTitle } from '../../plugins/shared/utils';
|
|
7
|
-
const { getEntryTitle, getEntryStatus
|
|
7
|
+
const { getEntryTitle , getEntryStatus } = entityHelpers;
|
|
8
8
|
export function FetchingWrappedResourceInlineCard(props) {
|
|
9
|
-
const { link, onEntityFetchComplete
|
|
10
|
-
const { data, status: requestStatus
|
|
9
|
+
const { link , onEntityFetchComplete } = props;
|
|
10
|
+
const { data , status: requestStatus } = useResource(link.linkType, link.urn);
|
|
11
11
|
React.useEffect(()=>{
|
|
12
12
|
if (requestStatus === 'success') {
|
|
13
13
|
onEntityFetchComplete?.();
|
|
@@ -17,18 +17,18 @@ export function FetchingWrappedResourceInlineCard(props) {
|
|
|
17
17
|
requestStatus
|
|
18
18
|
]);
|
|
19
19
|
if (requestStatus === 'error') {
|
|
20
|
-
return
|
|
20
|
+
return React.createElement(InlineEntryCard, {
|
|
21
21
|
title: "Entry missing or inaccessible",
|
|
22
22
|
testId: INLINES.EMBEDDED_RESOURCE,
|
|
23
23
|
isSelected: props.isSelected
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
if (requestStatus === 'loading' || data === undefined) {
|
|
27
|
-
return
|
|
27
|
+
return React.createElement(InlineEntryCard, {
|
|
28
28
|
isLoading: true
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
|
-
const { resource: entry, contentType, defaultLocaleCode, space
|
|
31
|
+
const { resource: entry , contentType , defaultLocaleCode , space } = data;
|
|
32
32
|
const title = getEntryTitle({
|
|
33
33
|
entry,
|
|
34
34
|
contentType,
|
|
@@ -38,18 +38,18 @@ export function FetchingWrappedResourceInlineCard(props) {
|
|
|
38
38
|
});
|
|
39
39
|
const truncatedTitle = truncateTitle(title, 40);
|
|
40
40
|
const status = getEntryStatus(entry.sys);
|
|
41
|
-
return
|
|
41
|
+
return React.createElement(InlineEntryCard, {
|
|
42
42
|
testId: INLINES.EMBEDDED_RESOURCE,
|
|
43
43
|
isSelected: props.isSelected,
|
|
44
44
|
title: `${contentType.name}: ${truncatedTitle} (Space: ${space.name} – Env.: ${entry.sys.environment.sys.id})`,
|
|
45
45
|
status: status,
|
|
46
46
|
actions: [
|
|
47
|
-
|
|
47
|
+
React.createElement(MenuItem, {
|
|
48
48
|
key: "remove",
|
|
49
49
|
onClick: props.onRemove,
|
|
50
50
|
disabled: props.isDisabled,
|
|
51
51
|
testId: "delete"
|
|
52
52
|
}, "Remove")
|
|
53
53
|
]
|
|
54
|
-
},
|
|
54
|
+
}, React.createElement(Text, null, title));
|
|
55
55
|
}
|
|
@@ -7,8 +7,8 @@ import { useLinkTracking } from '../links-tracking';
|
|
|
7
7
|
import { LinkedInlineWrapper } from '../shared/LinkedInlineWrapper';
|
|
8
8
|
import { FetchingWrappedResourceInlineCard } from './FetchingWrappedResourceInlineCard';
|
|
9
9
|
export function LinkedResourceInline(props) {
|
|
10
|
-
const { attributes, children, element
|
|
11
|
-
const { onEntityFetchComplete
|
|
10
|
+
const { attributes , children , element } = props;
|
|
11
|
+
const { onEntityFetchComplete } = useLinkTracking();
|
|
12
12
|
const isSelected = useSelected();
|
|
13
13
|
const editor = useContentfulEditor();
|
|
14
14
|
const sdk = useSdkContext();
|
|
@@ -21,10 +21,10 @@ export function LinkedResourceInline(props) {
|
|
|
21
21
|
at: pathToElement
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
-
return
|
|
24
|
+
return React.createElement(LinkedInlineWrapper, {
|
|
25
25
|
attributes: attributes,
|
|
26
26
|
link: element.data.target,
|
|
27
|
-
card:
|
|
27
|
+
card: React.createElement(FetchingWrappedResourceInlineCard, {
|
|
28
28
|
sdk: sdk,
|
|
29
29
|
link: link,
|
|
30
30
|
isDisabled: isDisabled,
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
|
|
1
|
+
import { assertOutput, jsx } from '../../../test-utils';
|
|
2
2
|
describe('normalization', ()=>{
|
|
3
3
|
it('can contain inline entries & hyperlinks', ()=>{
|
|
4
|
-
const input =
|
|
4
|
+
const input = jsx("editor", null, jsx("hh1", null, "some text before", jsx("hinline", {
|
|
5
5
|
type: "Entry",
|
|
6
6
|
id: "inline-entry"
|
|
7
|
-
}),
|
|
7
|
+
}), jsx("hlink", {
|
|
8
8
|
uri: "https://contentful.com"
|
|
9
|
-
}),
|
|
9
|
+
}), jsx("hlink", {
|
|
10
10
|
entry: "entry-id"
|
|
11
|
-
}),
|
|
11
|
+
}), jsx("hlink", {
|
|
12
12
|
resource: "resource-urn"
|
|
13
|
-
}),
|
|
13
|
+
}), jsx("hlink", {
|
|
14
14
|
asset: "asset-id"
|
|
15
|
-
}), "some text after"),
|
|
15
|
+
}), "some text after"), jsx("hp", null, jsx("htext", null)));
|
|
16
16
|
assertOutput({
|
|
17
17
|
input,
|
|
18
18
|
expected: input
|
|
19
19
|
});
|
|
20
20
|
});
|
|
21
21
|
it('unwraps nested paragraphs', ()=>{
|
|
22
|
-
const input =
|
|
23
|
-
const expected =
|
|
22
|
+
const input = jsx("editor", null, jsx("hh1", null, "one", ' ', jsx("hp", null, "two ", jsx("hp", null, "three ")), "four"));
|
|
23
|
+
const expected = jsx("editor", null, jsx("hh1", null, "one two three four"), jsx("hp", null, jsx("htext", null)));
|
|
24
24
|
assertOutput({
|
|
25
25
|
input,
|
|
26
26
|
expected
|
|
@@ -28,84 +28,84 @@ describe('normalization', ()=>{
|
|
|
28
28
|
});
|
|
29
29
|
describe('lifts other invalid children', ()=>{
|
|
30
30
|
it('block void elements', ()=>{
|
|
31
|
-
const input =
|
|
31
|
+
const input = jsx("editor", null, jsx("hh1", null, jsx("hembed", {
|
|
32
32
|
type: "Asset",
|
|
33
33
|
id: "1"
|
|
34
|
-
}), " start"),
|
|
34
|
+
}), " start"), jsx("hh1", null, "end ", jsx("hembed", {
|
|
35
35
|
type: "Asset",
|
|
36
36
|
id: "2"
|
|
37
|
-
})),
|
|
37
|
+
})), jsx("hh1", null, "in ", jsx("hembed", {
|
|
38
38
|
type: "Asset",
|
|
39
39
|
id: "3"
|
|
40
|
-
}), " between"),
|
|
40
|
+
}), " between"), jsx("hh1", null, jsx("hembed", {
|
|
41
41
|
type: "Entry",
|
|
42
42
|
id: "1"
|
|
43
|
-
}), " start"),
|
|
43
|
+
}), " start"), jsx("hh1", null, "end ", jsx("hembed", {
|
|
44
44
|
type: "Entry",
|
|
45
45
|
id: "2"
|
|
46
|
-
})),
|
|
46
|
+
})), jsx("hh1", null, "in ", jsx("hembed", {
|
|
47
47
|
type: "Entry",
|
|
48
48
|
id: "3"
|
|
49
|
-
}), " between"),
|
|
50
|
-
const expected =
|
|
49
|
+
}), " between"), jsx("hh1", null, jsx("hhr", null), " start"), jsx("hh1", null, "end ", jsx("hhr", null)), jsx("hh1", null, "in ", jsx("hhr", null), " between"));
|
|
50
|
+
const expected = jsx("editor", null, jsx("hembed", {
|
|
51
51
|
type: "Asset",
|
|
52
52
|
id: "1"
|
|
53
|
-
}),
|
|
53
|
+
}), jsx("hh1", null, " start"), jsx("hh1", null, "end "), jsx("hembed", {
|
|
54
54
|
type: "Asset",
|
|
55
55
|
id: "2"
|
|
56
|
-
}),
|
|
56
|
+
}), jsx("hh1", null, "in "), jsx("hembed", {
|
|
57
57
|
type: "Asset",
|
|
58
58
|
id: "3"
|
|
59
|
-
}),
|
|
59
|
+
}), jsx("hh1", null, " between"), jsx("hembed", {
|
|
60
60
|
type: "Entry",
|
|
61
61
|
id: "1"
|
|
62
|
-
}),
|
|
62
|
+
}), jsx("hh1", null, " start"), jsx("hh1", null, "end "), jsx("hembed", {
|
|
63
63
|
type: "Entry",
|
|
64
64
|
id: "2"
|
|
65
|
-
}),
|
|
65
|
+
}), jsx("hh1", null, "in "), jsx("hembed", {
|
|
66
66
|
type: "Entry",
|
|
67
67
|
id: "3"
|
|
68
|
-
}),
|
|
68
|
+
}), jsx("hh1", null, " between"), jsx("hhr", null), jsx("hh1", null, " start"), jsx("hh1", null, "end "), jsx("hhr", null), jsx("hh1", null, "in "), jsx("hhr", null), jsx("hh1", null, " between"), jsx("hp", null, jsx("htext", null)));
|
|
69
69
|
assertOutput({
|
|
70
70
|
input,
|
|
71
71
|
expected
|
|
72
72
|
});
|
|
73
73
|
});
|
|
74
74
|
it('nested headings', ()=>{
|
|
75
|
-
const input =
|
|
75
|
+
const input = jsx("editor", null, jsx("hh1", null, "some", jsx("hh1", null, jsx("htext", {
|
|
76
76
|
bold: true,
|
|
77
77
|
italic: true,
|
|
78
78
|
underline: true
|
|
79
79
|
}, "paragraph")), "text"));
|
|
80
|
-
const expected =
|
|
80
|
+
const expected = jsx("editor", null, jsx("hh1", null, "some"), jsx("hh1", null, jsx("htext", {
|
|
81
81
|
bold: true,
|
|
82
82
|
italic: true,
|
|
83
83
|
underline: true
|
|
84
|
-
}, "paragraph")),
|
|
84
|
+
}, "paragraph")), jsx("hh1", null, "text"), jsx("hp", null, jsx("htext", null)));
|
|
85
85
|
assertOutput({
|
|
86
86
|
input,
|
|
87
87
|
expected
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
90
|
it('handles quotes', ()=>{
|
|
91
|
-
const input =
|
|
92
|
-
const expected =
|
|
91
|
+
const input = jsx("editor", null, jsx("hh1", null, "some", jsx("hquote", null, jsx("hp", null, "quote")), "text"));
|
|
92
|
+
const expected = jsx("editor", null, jsx("hh1", null, "some"), jsx("hquote", null, jsx("hp", null, "quote")), jsx("hh1", null, "text"), jsx("hp", null, jsx("htext", null)));
|
|
93
93
|
assertOutput({
|
|
94
94
|
input,
|
|
95
95
|
expected
|
|
96
96
|
});
|
|
97
97
|
});
|
|
98
98
|
it('handles lists', ()=>{
|
|
99
|
-
const input =
|
|
100
|
-
const expected =
|
|
99
|
+
const input = jsx("editor", null, jsx("hh1", null, "some", jsx("hul", null, jsx("hli", null, jsx("hp", null, "list item"))), "text"));
|
|
100
|
+
const expected = jsx("editor", null, jsx("hh1", null, "some"), jsx("hul", null, jsx("hli", null, jsx("hp", null, "list item"))), jsx("hh1", null, "text"), jsx("hp", null, jsx("htext", null)));
|
|
101
101
|
assertOutput({
|
|
102
102
|
input,
|
|
103
103
|
expected
|
|
104
104
|
});
|
|
105
105
|
});
|
|
106
106
|
it('handles tables', ()=>{
|
|
107
|
-
const input =
|
|
108
|
-
const expected =
|
|
107
|
+
const input = jsx("editor", null, jsx("hh1", null, "some", jsx("htable", null, jsx("htr", null, jsx("htd", null, jsx("hp", null, "cell 1")), jsx("htd", null, jsx("hp", null, "cell 2")))), "text"));
|
|
108
|
+
const expected = jsx("editor", null, jsx("hh1", null, "some"), jsx("htable", null, jsx("htr", null, jsx("htd", null, jsx("hp", null, "cell 1")), jsx("htd", null, jsx("hp", null, "cell 2")))), jsx("hh1", null, "text"), jsx("hp", null, jsx("htext", null)));
|
|
109
109
|
assertOutput({
|
|
110
110
|
input,
|
|
111
111
|
expected
|
|
@@ -55,20 +55,19 @@ const styles = {
|
|
|
55
55
|
`
|
|
56
56
|
}
|
|
57
57
|
};
|
|
58
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- TODO: explain this disable
|
|
59
58
|
function createHeading(Tag, block) {
|
|
60
59
|
return function Heading(props) {
|
|
61
|
-
return
|
|
60
|
+
return React.createElement(Tag, {
|
|
62
61
|
...props.attributes,
|
|
63
62
|
className: cx(styles.headings.root, styles.headings[block])
|
|
64
63
|
}, props.children);
|
|
65
64
|
};
|
|
66
65
|
}
|
|
67
66
|
export const HeadingComponents = {
|
|
68
|
-
[BLOCKS.HEADING_1]:
|
|
69
|
-
[BLOCKS.HEADING_2]:
|
|
70
|
-
[BLOCKS.HEADING_3]:
|
|
71
|
-
[BLOCKS.HEADING_4]:
|
|
72
|
-
[BLOCKS.HEADING_5]:
|
|
73
|
-
[BLOCKS.HEADING_6]:
|
|
67
|
+
[BLOCKS.HEADING_1]: React.memo(createHeading('h1', BLOCKS.HEADING_1)),
|
|
68
|
+
[BLOCKS.HEADING_2]: React.memo(createHeading('h2', BLOCKS.HEADING_2)),
|
|
69
|
+
[BLOCKS.HEADING_3]: React.memo(createHeading('h3', BLOCKS.HEADING_3)),
|
|
70
|
+
[BLOCKS.HEADING_4]: React.memo(createHeading('h4', BLOCKS.HEADING_4)),
|
|
71
|
+
[BLOCKS.HEADING_5]: React.memo(createHeading('h5', BLOCKS.HEADING_5)),
|
|
72
|
+
[BLOCKS.HEADING_6]: React.memo(createHeading('h6', BLOCKS.HEADING_6))
|
|
74
73
|
};
|
|
@@ -9,6 +9,10 @@ import { getElementFromCurrentSelection, focus, isBlockSelected, toggleElement }
|
|
|
9
9
|
import { isNodeTypeEnabled } from '../../../helpers/validations';
|
|
10
10
|
import { useSdkContext } from '../../../SdkProvider';
|
|
11
11
|
const styles = {
|
|
12
|
+
button: css({
|
|
13
|
+
minWidth: '125px',
|
|
14
|
+
justifyContent: 'space-between'
|
|
15
|
+
}),
|
|
12
16
|
dropdown: {
|
|
13
17
|
root: css`
|
|
14
18
|
font-weight: ${tokens.fontWeightDemiBold};
|
|
@@ -52,13 +56,22 @@ export function ToolbarHeadingButton(props) {
|
|
|
52
56
|
const [selected, setSelected] = React.useState(BLOCKS.PARAGRAPH);
|
|
53
57
|
React.useEffect(()=>{
|
|
54
58
|
if (!editor?.selection) return;
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
|
|
59
|
+
const elements = getElementFromCurrentSelection(editor);
|
|
60
|
+
for (const element of elements){
|
|
61
|
+
if (typeof element === 'object' && 'type' in element) {
|
|
62
|
+
const el = element;
|
|
63
|
+
const match = LABELS[el.type];
|
|
64
|
+
if (match) {
|
|
65
|
+
setSelected(el.type);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
setSelected(BLOCKS.PARAGRAPH);
|
|
58
71
|
}, [
|
|
59
72
|
editor?.operations,
|
|
60
73
|
editor?.selection
|
|
61
|
-
]);
|
|
74
|
+
]);
|
|
62
75
|
const [nodeTypesByEnablement, someHeadingsEnabled] = React.useMemo(()=>{
|
|
63
76
|
const nodeTypesByEnablement = Object.fromEntries(Object.keys(LABELS).map((nodeType)=>[
|
|
64
77
|
nodeType,
|
|
@@ -79,13 +92,7 @@ export function ToolbarHeadingButton(props) {
|
|
|
79
92
|
setSelected(type);
|
|
80
93
|
setOpen(false);
|
|
81
94
|
const prevOnChange = editor.onChange;
|
|
82
|
-
|
|
83
|
-
The focus might happen at point in time when
|
|
84
|
-
`toggleElement` (helper for toggleNodeType) changes aren't rendered yet, causing the browser
|
|
85
|
-
to place the cursor at the start of the text.
|
|
86
|
-
We wait for the change event before focusing
|
|
87
|
-
the editor again. This ensures the cursor is back at the previous
|
|
88
|
-
position.*/ editor.onChange = (...args)=>{
|
|
95
|
+
editor.onChange = (...args)=>{
|
|
89
96
|
focus(editor);
|
|
90
97
|
editor.onChange = prevOnChange;
|
|
91
98
|
prevOnChange(...args);
|
|
@@ -101,25 +108,26 @@ export function ToolbarHeadingButton(props) {
|
|
|
101
108
|
};
|
|
102
109
|
}
|
|
103
110
|
if (!editor) return null;
|
|
104
|
-
return
|
|
111
|
+
return React.createElement(Menu, {
|
|
105
112
|
isOpen: isOpen,
|
|
106
113
|
onClose: ()=>setOpen(false)
|
|
107
|
-
},
|
|
114
|
+
}, React.createElement(Menu.Trigger, null, React.createElement(Button, {
|
|
108
115
|
size: "small",
|
|
109
116
|
testId: "toolbar-heading-toggle",
|
|
110
117
|
variant: "transparent",
|
|
111
|
-
endIcon:
|
|
118
|
+
endIcon: React.createElement(ChevronDownIcon, null),
|
|
112
119
|
isDisabled: props.isDisabled,
|
|
113
|
-
onClick: ()=>someHeadingsEnabled && setOpen(!isOpen)
|
|
114
|
-
|
|
120
|
+
onClick: ()=>someHeadingsEnabled && setOpen(!isOpen),
|
|
121
|
+
className: styles.button
|
|
122
|
+
}, LABELS[selected])), React.createElement(Menu.List, {
|
|
115
123
|
testId: "dropdown-heading-list"
|
|
116
|
-
},
|
|
124
|
+
}, Object.keys(LABELS).map((nodeType)=>nodeTypesByEnablement[nodeType] && React.createElement(Menu.Item, {
|
|
117
125
|
key: nodeType,
|
|
118
126
|
isInitiallyFocused: selected === nodeType,
|
|
119
127
|
onClick: handleOnSelectItem(nodeType),
|
|
120
128
|
testId: `dropdown-option-${nodeType}`,
|
|
121
129
|
disabled: props.isDisabled
|
|
122
|
-
},
|
|
130
|
+
}, React.createElement("span", {
|
|
123
131
|
className: cx(styles.dropdown.root, styles.dropdown[nodeType])
|
|
124
132
|
}, LABELS[nodeType]))).filter(Boolean)));
|
|
125
133
|
}
|
|
@@ -5,7 +5,7 @@ import { transformLift, transformUnwrap } from '../../helpers/transformers';
|
|
|
5
5
|
import { isMarkActive, getAboveNode } from '../../internal/queries';
|
|
6
6
|
import { COMMAND_PROMPT } from '../CommandPalette/constants';
|
|
7
7
|
import { HeadingComponents } from './components/Heading';
|
|
8
|
-
const buildHeadingEventHandler = (type)=>(editor, { options: { hotkey
|
|
8
|
+
const buildHeadingEventHandler = (type)=>(editor, { options: { hotkey } })=>(event)=>{
|
|
9
9
|
if (editor.selection && hotkey && isHotkey(hotkey, event)) {
|
|
10
10
|
const isActive = isBlockSelected(editor, type);
|
|
11
11
|
editor.tracking.onShortcutAction(isActive ? 'remove' : 'insert', {
|
|
@@ -20,7 +20,6 @@ const buildHeadingEventHandler = (type)=>(editor, { options: { hotkey } })=>(eve
|
|
|
20
20
|
export const createHeadingPlugin = ()=>({
|
|
21
21
|
key: 'HeadingPlugin',
|
|
22
22
|
softBreak: [
|
|
23
|
-
// create a new line with SHIFT+Enter inside a heading
|
|
24
23
|
{
|
|
25
24
|
hotkey: 'shift+enter',
|
|
26
25
|
query: {
|
|
@@ -43,16 +42,12 @@ export const createHeadingPlugin = ()=>({
|
|
|
43
42
|
then: (editor)=>{
|
|
44
43
|
return {
|
|
45
44
|
exitBreak: [
|
|
46
|
-
// Pressing ENTER at the start or end of a heading text inserts a
|
|
47
|
-
// normal paragraph.
|
|
48
45
|
{
|
|
49
46
|
hotkey: 'enter',
|
|
50
47
|
query: {
|
|
51
48
|
allow: HEADINGS,
|
|
52
49
|
end: true,
|
|
53
50
|
start: true,
|
|
54
|
-
// Exclude headings inside lists as it interferes with the list's
|
|
55
|
-
// insertBreak implementation
|
|
56
51
|
filter: ([, path])=>!getAboveNode(editor, {
|
|
57
52
|
at: path,
|
|
58
53
|
match: {
|
|
@@ -72,32 +72,29 @@ export function ToolbarHrButton(props) {
|
|
|
72
72
|
};
|
|
73
73
|
const hasText = !!getText(editor, editor.selection.focus.path);
|
|
74
74
|
hasText ? insertNodes(editor, hr) : setNodes(editor, hr);
|
|
75
|
-
// Move focus to the next paragraph (added by TrailingParagraph plugin)
|
|
76
75
|
moveToTheNextLine(editor);
|
|
77
76
|
focus(editor);
|
|
78
77
|
}
|
|
79
78
|
if (!editor) return null;
|
|
80
|
-
return
|
|
79
|
+
return React.createElement(ToolbarButton, {
|
|
81
80
|
title: "HR",
|
|
82
81
|
isDisabled: props.isDisabled,
|
|
83
82
|
onClick: handleOnClick,
|
|
84
83
|
testId: "hr-toolbar-button",
|
|
85
84
|
isActive: isBlockSelected(editor, BLOCKS.HR)
|
|
86
|
-
},
|
|
85
|
+
}, React.createElement(HorizontalRuleIcon, null));
|
|
87
86
|
}
|
|
88
87
|
export function Hr(props) {
|
|
89
88
|
const isSelected = Slate.useSelected();
|
|
90
89
|
const isFocused = Slate.useFocused();
|
|
91
|
-
return
|
|
90
|
+
return React.createElement("div", {
|
|
92
91
|
...props.attributes,
|
|
93
92
|
className: styles.container,
|
|
94
|
-
// COMPAT: To make HR copyable in Safari, we verify this attribute below on `deserialize`
|
|
95
93
|
"data-void-element": BLOCKS.HR
|
|
96
|
-
},
|
|
94
|
+
}, React.createElement("div", {
|
|
97
95
|
draggable: true,
|
|
98
|
-
// Moving `contentEditable` to this div makes it to be selectable when being the first void element, e.g pressing ctrl + a to select everything
|
|
99
96
|
contentEditable: false
|
|
100
|
-
},
|
|
97
|
+
}, React.createElement("hr", {
|
|
101
98
|
className: cx(styles.hr, isSelected && isFocused ? styles.hrSelected : undefined)
|
|
102
99
|
})), props.children);
|
|
103
100
|
}
|
|
@@ -78,7 +78,7 @@ export function HyperlinkModal(props) {
|
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
function entityToLink(entity) {
|
|
81
|
-
const { id, type
|
|
81
|
+
const { id , type } = entity.sys;
|
|
82
82
|
return {
|
|
83
83
|
sys: {
|
|
84
84
|
id,
|
|
@@ -88,8 +88,7 @@ export function HyperlinkModal(props) {
|
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
90
|
function entityToResourceLink(entity) {
|
|
91
|
-
const { urn
|
|
92
|
-
// @ts-expect-error wait for update of app-sdk version
|
|
91
|
+
const { urn } = entity.sys;
|
|
93
92
|
return {
|
|
94
93
|
sys: {
|
|
95
94
|
urn,
|
|
@@ -122,7 +121,6 @@ export function HyperlinkModal(props) {
|
|
|
122
121
|
const options = {
|
|
123
122
|
allowedResources: getAllowedResourcesForNodeType(props.sdk.field, INLINES.RESOURCE_HYPERLINK)
|
|
124
123
|
};
|
|
125
|
-
// @ts-expect-error wait for update of app-sdk version
|
|
126
124
|
const entry = await props.sdk.dialogs.selectSingleResourceEntry(options);
|
|
127
125
|
if (entry) {
|
|
128
126
|
setLinkTarget('');
|
|
@@ -143,30 +141,30 @@ export function HyperlinkModal(props) {
|
|
|
143
141
|
event.preventDefault();
|
|
144
142
|
setLinkEntity(null);
|
|
145
143
|
}
|
|
146
|
-
return
|
|
144
|
+
return React.createElement(EntityProvider, {
|
|
147
145
|
sdk: props.sdk
|
|
148
|
-
},
|
|
146
|
+
}, React.createElement(React.Fragment, null, React.createElement(ModalContent, null, React.createElement(Form, null, !props.linkType && React.createElement(FormControl, {
|
|
149
147
|
id: "link-text",
|
|
150
148
|
isRequired: true
|
|
151
|
-
},
|
|
149
|
+
}, React.createElement(FormControl.Label, null, "Link text"), React.createElement(TextInput, {
|
|
152
150
|
testId: "link-text-input",
|
|
153
151
|
name: "link-text",
|
|
154
152
|
value: linkText,
|
|
155
153
|
onChange: (event)=>setLinkText(event.target.value)
|
|
156
|
-
})), enabledLinkTypes.length > 1 &&
|
|
154
|
+
})), enabledLinkTypes.length > 1 && React.createElement(FormControl, {
|
|
157
155
|
id: "link-type"
|
|
158
|
-
},
|
|
156
|
+
}, React.createElement(FormControl.Label, null, "Link type"), React.createElement(Select, {
|
|
159
157
|
value: linkType,
|
|
160
158
|
onChange: (event)=>setLinkType(event.target.value),
|
|
161
159
|
testId: "link-type-input",
|
|
162
160
|
isDisabled: props.readonly
|
|
163
|
-
}, enabledLinkTypes.map((nodeType)
|
|
161
|
+
}, enabledLinkTypes.map((nodeType)=>React.createElement(Select.Option, {
|
|
164
162
|
key: nodeType,
|
|
165
163
|
value: nodeType
|
|
166
|
-
}, LINK_TYPE_SELECTION_VALUES[nodeType])))), linkType === INLINES.HYPERLINK &&
|
|
164
|
+
}, LINK_TYPE_SELECTION_VALUES[nodeType])))), linkType === INLINES.HYPERLINK && React.createElement(FormControl, {
|
|
167
165
|
id: "linkTarget",
|
|
168
166
|
isRequired: true
|
|
169
|
-
},
|
|
167
|
+
}, React.createElement(FormControl.Label, null, "Link target"), React.createElement(TextInput, {
|
|
170
168
|
ref: linkTargetInputRef,
|
|
171
169
|
name: "linkTarget",
|
|
172
170
|
value: linkTarget,
|
|
@@ -176,46 +174,46 @@ export function HyperlinkModal(props) {
|
|
|
176
174
|
},
|
|
177
175
|
testId: "link-target-input",
|
|
178
176
|
isDisabled: props.readonly
|
|
179
|
-
}),
|
|
177
|
+
}), React.createElement(FormControl.HelpText, null, "A protocol may be required, e.g. https://")), linkType !== INLINES.HYPERLINK && React.createElement("div", null, React.createElement(FormLabel, {
|
|
180
178
|
isRequired: true,
|
|
181
179
|
htmlFor: ""
|
|
182
|
-
}, "Link target", ' '), linkEntity && linkEntity.sys.linkType === SYS_LINK_TYPES[linkType] ?
|
|
180
|
+
}, "Link target", ' '), linkEntity && linkEntity.sys.linkType === SYS_LINK_TYPES[linkType] ? React.createElement(React.Fragment, null, !props.readonly && React.createElement(TextLink, {
|
|
183
181
|
testId: "entity-selection-link",
|
|
184
182
|
onClick: resetLinkEntity,
|
|
185
183
|
className: styles.removeSelectionLabel
|
|
186
|
-
}, "Remove selection"),
|
|
184
|
+
}, "Remove selection"), React.createElement("div", null, linkType === INLINES.ENTRY_HYPERLINK && isEntryLink(linkEntity) && React.createElement(FetchingWrappedEntryCard, {
|
|
187
185
|
sdk: props.sdk,
|
|
188
186
|
locale: props.sdk.field.locale,
|
|
189
187
|
entryId: linkEntity.sys.id,
|
|
190
188
|
isDisabled: true,
|
|
191
189
|
isSelected: false
|
|
192
|
-
}), linkType === INLINES.RESOURCE_HYPERLINK && isResourceLink(linkEntity) &&
|
|
190
|
+
}), linkType === INLINES.RESOURCE_HYPERLINK && isResourceLink(linkEntity) && React.createElement(FetchingWrappedResourceCard, {
|
|
193
191
|
sdk: props.sdk,
|
|
194
192
|
link: linkEntity.sys,
|
|
195
193
|
isDisabled: true,
|
|
196
194
|
isSelected: false
|
|
197
|
-
}), linkType === INLINES.ASSET_HYPERLINK && isAssetLink(linkEntity) &&
|
|
195
|
+
}), linkType === INLINES.ASSET_HYPERLINK && isAssetLink(linkEntity) && React.createElement(FetchingWrappedAssetCard, {
|
|
198
196
|
sdk: props.sdk,
|
|
199
197
|
locale: props.sdk.field.locale,
|
|
200
198
|
assetId: linkEntity.sys.id,
|
|
201
199
|
isDisabled: true,
|
|
202
200
|
isSelected: false
|
|
203
|
-
}))) :
|
|
201
|
+
}))) : React.createElement("div", null, linkType === INLINES.ENTRY_HYPERLINK && React.createElement(TextLink, {
|
|
204
202
|
testId: "entity-selection-link",
|
|
205
203
|
onClick: selectEntry
|
|
206
|
-
}, "Select entry"), linkType === INLINES.RESOURCE_HYPERLINK &&
|
|
204
|
+
}, "Select entry"), linkType === INLINES.RESOURCE_HYPERLINK && React.createElement(TextLink, {
|
|
207
205
|
testId: "entity-selection-link",
|
|
208
206
|
onClick: selectResourceEntry
|
|
209
|
-
}, "Select entry"), linkType === INLINES.ASSET_HYPERLINK &&
|
|
207
|
+
}, "Select entry"), linkType === INLINES.ASSET_HYPERLINK && React.createElement(TextLink, {
|
|
210
208
|
testId: "entity-selection-link",
|
|
211
209
|
onClick: selectAsset
|
|
212
|
-
}, "Select asset"))))),
|
|
210
|
+
}, "Select asset"))))), React.createElement(ModalControls, null, React.createElement(Button, {
|
|
213
211
|
type: "button",
|
|
214
212
|
onClick: ()=>props.onClose(null),
|
|
215
213
|
variant: "secondary",
|
|
216
214
|
testId: "cancel-cta",
|
|
217
215
|
size: "small"
|
|
218
|
-
}, "Cancel"),
|
|
216
|
+
}, "Cancel"), React.createElement(Button, {
|
|
219
217
|
type: "submit",
|
|
220
218
|
variant: "positive",
|
|
221
219
|
size: "small",
|
|
@@ -251,8 +249,8 @@ export async function addOrEditLink(editor, sdk, logAction, targetPath) {
|
|
|
251
249
|
shouldCloseOnEscapePress: true,
|
|
252
250
|
shouldCloseOnOverlayClick: true,
|
|
253
251
|
allowHeightOverflow: true
|
|
254
|
-
}, ({ onClose
|
|
255
|
-
return
|
|
252
|
+
}, ({ onClose })=>{
|
|
253
|
+
return React.createElement(HyperlinkModal, {
|
|
256
254
|
linkTarget: linkTarget,
|
|
257
255
|
linkText: currentLinkText,
|
|
258
256
|
linkType: linkType,
|
|
@@ -268,7 +266,7 @@ export async function addOrEditLink(editor, sdk, logAction, targetPath) {
|
|
|
268
266
|
logAction(isEditing ? 'cancelEditHyperlinkDialog' : 'cancelCreateHyperlinkDialog');
|
|
269
267
|
return;
|
|
270
268
|
}
|
|
271
|
-
const { linkText: text, linkTarget: url, linkType: type, linkEntity: target
|
|
269
|
+
const { linkText: text , linkTarget: url , linkType: type , linkEntity: target } = data;
|
|
272
270
|
withoutNormalizing(editor, ()=>{
|
|
273
271
|
insertLink(editor, {
|
|
274
272
|
text,
|