Hotfix/v0.63.1

CHANGELOG.md

@@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.63.1](https://github.com/isomerpages/isomercms-frontend/compare/v0.63.0...v0.63.1)
+
+- fix(editpagelayout): shift context call elsewhere [`c95b2ab`](https://github.com/isomerpages/isomercms-frontend/commit/c95b2ab7e4909d0b9852e8603bc5995a716dc743)
+- fix(legacyeditpage): minor style fix so the editor grows [`ad8b36c`](https://github.com/isomerpages/isomercms-frontend/commit/ad8b36cfa09c2bafb4e1c44d65343d2621e2d1c8)
+
 #### [v0.63.0](https://github.com/isomerpages/isomercms-frontend/compare/v0.62.0...v0.63.0)
 
+> 6 December 2023
+
 - fix(embed-views): add a max width [`#1729`](https://github.com/isomerpages/isomercms-frontend/pull/1729)
 - fix(blockwrapper): remove padding [`#1728`](https://github.com/isomerpages/isomercms-frontend/pull/1728)
 - feat(editor): enhance image bubble menu with more functions [`#1721`](https://github.com/isomerpages/isomercms-frontend/pull/1721)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomercms-frontend",
-  "version": "0.63.0",
+  "version": "0.63.1",
   "private": true,
   "engines": {
     "node": ">=16.0.0"

src/layouts/EditPage/EditPageLayout.tsx

@@ -20,8 +20,6 @@ import Header from "components/Header"
 import { OverwriteChangesModal } from "components/OverwriteChangesModal"
 import { WarningModal } from "components/WarningModal"
 
-import { useEditorDrawerContext } from "contexts/EditorDrawerContext"
-
 import { useGetMultipleMediaHook } from "hooks/mediaHooks"
 import { useGetPageHook, useUpdatePageHook } from "hooks/pageHooks"
 import { useCspHook, useGetSiteColorsHook } from "hooks/settingsHooks"
@@ -37,16 +35,17 @@ import { sanitiseRawHtml, updateHtmlWithMediaData } from "./utils"
 interface EditPageLayoutProps {
   getEditorContent: () => string
   setEditorContent: (content: string) => void
+  shouldDisableSave?: boolean
   variant: PageVariant
 }
 
 export const EditPageLayout = ({
   getEditorContent,
   setEditorContent,
   variant = "markdown",
+  shouldDisableSave = false,
   children,
 }: PropsWithChildren<EditPageLayoutProps>) => {
-  const { isAnyDrawerOpen } = useEditorDrawerContext()
   const params = useParams<{ siteName: string }>()
   const decodedParams = getDecodedParams(params)
   const [mediaSrcs, setMediaSrcs] = useState(new Set(""))
@@ -223,7 +222,7 @@ export const EditPageLayout = ({
               // TODO: Add an alert/modal
               // to warn the user when they violate our csp
               // so they know why + can take action to remedy
-              isDisabled={isContentViolation || isAnyDrawerOpen}
+              isDisabled={isContentViolation || shouldDisableSave}
               isLoading={isSavingPage}
             >
               Save

src/layouts/EditPage/MarkdownEditPage.tsx

@@ -24,6 +24,7 @@ import MarkdownEditor from "components/pages/MarkdownEditor"
 import PagePreview from "components/pages/PagePreview"
 
 import { useEditorContext } from "contexts/EditorContext"
+import { useEditorDrawerContext } from "contexts/EditorDrawerContext"
 
 import { useGetMultipleMediaHook } from "hooks/mediaHooks"
 import { useGetPageHook } from "hooks/pageHooks"
@@ -119,11 +120,14 @@ export const MarkdownEditPage = ({ togglePreview }: MarkdownPageProps) => {
     updateHtmlWithMediaData()
   }, [mediaData, editorValue, updateHtmlWithMediaData])
 
+  const { isAnyDrawerOpen } = useEditorDrawerContext()
+
   return (
     <EditPageLayout
       variant="markdown"
       getEditorContent={() => editorValue}
       setEditorContent={(content: string) => setEditorValue(content)}
+      shouldDisableSave={isAnyDrawerOpen}
     >
       <Box w="100%" p="1.25rem">
         <Flex flexDir="row" bg="gray.100" p="1.38rem" mb="1.38rem">

src/layouts/EditPage/TiptapEditPage.tsx

@@ -98,12 +98,15 @@ export const TiptapEditPage = ({
     setHtmlChunk(processedChunk)
   }, [mediaData, editorHtmlValue, csp, mediaSrcs])
 
+  const { isAnyDrawerOpen } = useEditorDrawerContext()
+
   return (
     <EditPageLayout
       setEditorContent={(content) => {
         editor.commands.setContent(content)
       }}
       getEditorContent={() => editor.getHTML()}
+      shouldDisableSave={isAnyDrawerOpen}
       variant="tiptap"
     >
       {/* Editor drawers */}

src/layouts/LegacyEditPage.jsx

@@ -97,7 +97,7 @@ const EditPage = ({ match }) => {
       setEditorContent={setEditorValue}
     >
       {/* Editor */}
-      <Box w="50%" p="1.25rem" maxH="100%" overflowY="scroll">
+      <Box minW="50%" flexGrow={1} p="1.25rem" maxH="100%" overflowY="scroll">
         <MarkdownEditor
           siteName={siteName}
           onChange={(value) => setEditorValue(value)}