Merge pull request #1620 from vivid-planet/merge-main-into-next

Merge main into next
vivid-planet · Jan 30, 2024 · 6f0fa5c · 6f0fa5c
2 parents 84e3e1f + fc8e475
commit 6f0fa5c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 138 deletions.
diff --git a/.changeset/loud-carpets-happen.md b/.changeset/loud-carpets-happen.md
@@ -0,0 +1,5 @@
+---
+"@comet/admin-icons": patch
+---
+
+Fix broken `Logout` icon
diff --git a/.changeset/plenty-dots-exist.md b/.changeset/plenty-dots-exist.md
@@ -0,0 +1,5 @@
+---
+"@comet/admin-rte": patch
+---
+
+Retain headings 4 - 6, blockquote and strikethrough formatting when copying from one RTE to another
diff --git a/docs/docs/story-poc.mdx b/docs/docs/story-poc.mdx
diff --git a/docs/src/stories/Checkbox.tsx b/docs/src/stories/Checkbox.tsx
diff --git a/docs/src/stories/sub/Test.tsx b/docs/src/stories/sub/Test.tsx
diff --git a/packages/admin/admin-icons/icons/logout.svg b/packages/admin/admin-icons/icons/logout.svg
diff --git a/packages/admin/admin-rte/src/core/filterEditor/removeUnsupportedBlockTypes.ts b/packages/admin/admin-rte/src/core/filterEditor/removeUnsupportedBlockTypes.ts
@@ -5,7 +5,7 @@ import changeBlockType from "./utils/changeBlockType";
 
 const removeUnsupportedBlockTypes: FilterEditorStateBeforeUpdateFn = (newState, { supports, standardBlockType }) => {
     // unstyle all core-blocks which are not supported
-    const blackListBlocks: DraftBlockType[] = ["paragraph", "header-four", "header-five", "header-six", "blockquote", "code-block", "atomic"]; // these are not supported at all by our rte
+    const blackListBlocks: DraftBlockType[] = ["paragraph", "code-block", "atomic"]; // these are not supported at all by our rte
 
     const supportsToBlockMap: Partial<Record<SupportedThings, DraftBlockType>> = {
         "header-one": "header-one",

diff --git a/packages/admin/admin-rte/src/core/filterEditor/removeUnsupportedInlineStyles.ts b/packages/admin/admin-rte/src/core/filterEditor/removeUnsupportedInlineStyles.ts
@@ -4,7 +4,7 @@ import removeInlineStyles from "./utils/removeInlineStyles";
 
 const removeUnsupportedInlineStyles: FilterEditorStateBeforeUpdateFn = (newState, { supports }) => {
     // unstyle all core-blocks which are not supported
-    const blackListInlineStyles: InlineStyleType[] = ["STRIKETHROUGH", "CODE"]; // these are not supported at all by our rte
+    const blackListInlineStyles: InlineStyleType[] = ["CODE"]; // these are not supported at all by our rte
 
     const supportsToInlineStyleMap: Partial<Record<SupportedThings, InlineStyleType>> = {
         bold: "BOLD",

diff --git a/packages/admin/cms-admin/src/pages/pageTree/CopyPasteMenuItem.tsx b/packages/admin/cms-admin/src/pages/pageTree/CopyPasteMenuItem.tsx
@@ -41,17 +41,6 @@ export const CopyPasteMenuItem = ({ page }: Props): React.ReactElement => {
             >
                 <FormattedMessage id="comet.pages.pages.page.paste" defaultMessage="Paste" />
             </RowActionsItem>
-            <RowActionsItem
-                icon={<Copy />}
-                onClick={async () => {
-                    const subTree = subTreeFromNode(page, tree);
-                    const pagesAsArray = treeMapToArray(subTree, "root");
-                    const pages = await prepareForClipboard(pagesAsArray);
-                    await sendPages(page.parentId, pages, { targetPos: page.pos + 1 });
-                }}
-            >
-                <FormattedMessage id="comet.pageTree.duplicate" defaultMessage="Duplicate" />
-            </RowActionsItem>
         </>
     );
 };
diff --git a/packages/admin/cms-admin/src/pages/pageTree/PageActions.tsx b/packages/admin/cms-admin/src/pages/pageTree/PageActions.tsx
@@ -85,15 +85,6 @@ export default function PageActions({ page, editDialog, children, siteUrl }: Pro
                 ]}
                 <RowActionsMenu>
                     {page.visibility !== "Archived" && [
-                        <RowActionsItem
-                            key="edit"
-                            icon={<Edit />}
-                            onClick={() => {
-                                stackSwitchApi.activatePage("edit", String(page.id));
-                            }}
-                        >
-                            <FormattedMessage id="comet.pages.pages.page.editContent" defaultMessage="Edit content" />
-                        </RowActionsItem>,
                         <RowActionsItem
                             key="pageProperties"
                             icon={<Settings />}