Improve solution for #625

publishpress · Dec 15, 2023 · 170eadd · 170eadd
1 parent 42eaa71
commit 170eadd
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 126 deletions.
diff --git a/assets/js/classic-editor.js.map b/assets/js/classic-editor.js.map
diff --git a/assets/js/quick-edit.js b/assets/js/quick-edit.js
diff --git a/assets/js/quick-edit.js.map b/assets/js/quick-edit.js.map
diff --git a/assets/js/settings-post-types.js b/assets/js/settings-post-types.js
diff --git a/assets/js/settings-post-types.js.map b/assets/js/settings-post-types.js.map
diff --git a/assets/jsx/bulk-edit.jsx b/assets/jsx/bulk-edit.jsx
@@ -65,52 +65,42 @@ inlineEditPost.setBulk = function (id) {
         });
     }
 
-    const saveButton = document.querySelector('#bulk_edit');
-    if (saveButton) {
-        saveButton.onclick = function() {
-            setTimeout(() => {
-                root.unmount();
-            }, delayToUnmountAfterSaving);
-        };
-    }
-
     const container = document.getElementById("publishpress-future-bulk-edit");
+    const component = (
+        <FutureActionPanelBulkEdit
+            storeName={storeName}
+            postType={postType}
+            isNewPost={isNewPost}
+            actionsSelectOptions={actionsSelectOptions}
+            is12Hour={is12Hour}
+            startOfWeek={startOfWeek}
+            strings={strings}
+            taxonomyName={taxonomyName}
+            nonce={nonce}
+        />
+    );
 
     if (createRoot) {
-        createRoot(container).render(
-            <FutureActionPanelBulkEdit
-                storeName={storeName}
-                postType={postType}
-                isNewPost={isNewPost}
-                actionsSelectOptions={actionsSelectOptions}
-                is12Hour={is12Hour}
-                startOfWeek={startOfWeek}
-                strings={strings}
-                taxonomyName={taxonomyName}
-                nonce={nonce}
-            />
-        );
-    } else {
-        render(
-            <FutureActionPanelBulkEdit
-                storeName={storeName}
-                postType={postType}
-                isNewPost={isNewPost}
-                actionsSelectOptions={actionsSelectOptions}
-                is12Hour={is12Hour}
-                startOfWeek={startOfWeek}
-                strings={strings}
-                taxonomyName={taxonomyName}
-                nonce={nonce}
-            />,
-            container
-        );
-    }
+        const root = createRoot(container);
 
-    inlineEditPost.revert = function () {
-        root.unmount();
+        root.render(component);
 
-        // Call the original WP revert function.
-        wpInlineEditRevert.apply(this, arguments);
-    };
+        const saveButton = document.querySelector('#bulk_edit');
+        if (saveButton) {
+            saveButton.onclick = function() {
+                setTimeout(() => {
+                    root.unmount();
+                }, delayToUnmountAfterSaving);
+            };
+        }
+
+        inlineEditPost.revert = function () {
+            root.unmount();
+
+            // Call the original WP revert function.
+            wpInlineEditRevert.apply(this, arguments);
+        };
+    } else {
+        render(component, container);
+    }
 };
diff --git a/assets/jsx/classic-editor.jsx b/assets/jsx/classic-editor.jsx
@@ -33,33 +33,22 @@ if (! isGutenbergEnabled()) {
     }
 
     const container = document.getElementById("publishpress-future-classic-editor");
+    const component = (
+        <FutureActionPanelClassicEditor
+            storeName={storeName}
+            postType={postType}
+            isNewPost={isNewPost}
+            actionsSelectOptions={actionsSelectOptions}
+            is12Hour={is12Hour}
+            startOfWeek={startOfWeek}
+            strings={strings}
+            taxonomyName={taxonomyName}
+        />
+    );
 
     if (createRoot) {
-        createRoot(container).render(
-            <FutureActionPanelClassicEditor
-                storeName={storeName}
-                postType={postType}
-                isNewPost={isNewPost}
-                actionsSelectOptions={actionsSelectOptions}
-                is12Hour={is12Hour}
-                startOfWeek={startOfWeek}
-                strings={strings}
-                taxonomyName={taxonomyName}
-            />
-        );
+        createRoot(container).render(component);
     } else {
-        render(
-            <FutureActionPanelClassicEditor
-                storeName={storeName}
-                postType={postType}
-                isNewPost={isNewPost}
-                actionsSelectOptions={actionsSelectOptions}
-                is12Hour={is12Hour}
-                startOfWeek={startOfWeek}
-                strings={strings}
-                taxonomyName={taxonomyName}
-            />,
-            container
-        );
+        render(component, container);
     }
 }
diff --git a/assets/jsx/quick-edit.jsx b/assets/jsx/quick-edit.jsx
@@ -79,6 +79,19 @@ inlineEditPost.edit = function (button, id) {
     }
 
     const container = document.getElementById("publishpress-future-quick-edit");
+    const component = (
+        <FutureActionPanelQuickEdit
+            storeName={storeName}
+            postType={postType}
+            isNewPost={isNewPost}
+            actionsSelectOptions={actionsSelectOptions}
+            is12Hour={is12Hour}
+            startOfWeek={startOfWeek}
+            strings={strings}
+            taxonomyName={taxonomyName}
+            nonce={nonce}
+        />
+    );
 
     if (createRoot) {
         const root = createRoot(container);
@@ -92,19 +105,7 @@ inlineEditPost.edit = function (button, id) {
             };
         }
 
-        root.render(
-            <FutureActionPanelQuickEdit
-                storeName={storeName}
-                postType={postType}
-                isNewPost={isNewPost}
-                actionsSelectOptions={actionsSelectOptions}
-                is12Hour={is12Hour}
-                startOfWeek={startOfWeek}
-                strings={strings}
-                taxonomyName={taxonomyName}
-                nonce={nonce}
-            />
-        );
+        root.render(component);
 
         inlineEditPost.revert = function () {
             root.unmount();
@@ -113,19 +114,6 @@ inlineEditPost.edit = function (button, id) {
             wpInlineEditRevert.apply(this, arguments);
         };
     } else {
-        render(
-            <FutureActionPanelQuickEdit
-                storeName={storeName}
-                postType={postType}
-                isNewPost={isNewPost}
-                actionsSelectOptions={actionsSelectOptions}
-                is12Hour={is12Hour}
-                startOfWeek={startOfWeek}
-                strings={strings}
-                taxonomyName={taxonomyName}
-                nonce={nonce}
-            />,
-            container
-        );
+        render(component, container);
     }
 };
diff --git a/assets/jsx/settings-post-types.jsx b/assets/jsx/settings-post-types.jsx
@@ -55,9 +55,9 @@ const SettingsFormPanel = (props) => {
 };
 
 const container = document.getElementById("publishpress-future-settings-post-types");
-
+const component = (<SettingsFormPanel />);
 if (createRoot) {
-    createRoot(container).render(<SettingsFormPanel />);
+    createRoot(container).render(component);
 } else {
-    render(<SettingsFormPanel />, container);
+    render(component, container);
 }
diff --git a/readme.txt b/readme.txt
@@ -151,6 +151,7 @@ Yes, the PublishPress Future plugin allows you to schedule automatic changes to
 * FIXED: Fix classic meta box when using Classic Editor plugin with the classic editor as default, #624;
 * FIXED: Fix default date for new posts, #623;
 * FIXED: Fix the quick edit form and future action column for pages, #618;
+* FIXED: Fix support for WP before 6.4, #625;
 
 = [3.1.5] - 14 Dec, 2023 =