Merge pull request #3872 from reduxframework/update-extendify-tmng798

Update Extendify Library

Author: kprovance

extendify-sdk/app/Admin.php

@@ -129,6 +129,7 @@ public function addScopedScriptsAndStyles()
                 'sdk_partner' => \esc_attr(APP::$sdkPartner),
                 'asset_path' => \esc_url(EXTENDIFY_URL . 'public/assets'),
                 'standalone' => \esc_attr(APP::$standalone),
+                'devbuild' => \esc_attr(APP::$environment === 'DEVELOPMENT'),
             ]
         );
         \wp_enqueue_script(App::$slug . '-scripts');

extendify-sdk/app/App.php

@@ -83,7 +83,7 @@ class App
      */
     public function __construct()
     {
-        if (isset($GLOBALS['extendify_sdk_partner'])) {
+        if (isset($GLOBALS['extendify_sdk_partner']) && $GLOBALS['extendify_sdk_partner']) {
             self::$sdkPartner = $GLOBALS['extendify_sdk_partner'];
         }
 

extendify-sdk/app/Controllers/UserController.php

@@ -55,6 +55,17 @@ public static function store($request)
         return new \WP_REST_Response(User::state());
     }
 
+    /**
+     * Delete the data
+     *
+     * @return array
+     */
+    public static function delete()
+    {
+        \delete_user_meta(\get_current_user_id(), 'extendifysdk_user_data');
+        return new \WP_REST_Response(User::state());
+    }
+
     /**
      * Sign up the user to the mailing list.
      *

extendify-sdk/jsconfig.json

@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "baseUrl": "./",
+        "paths": {
+            "@extendify/*": ["src/*"]
+        }
+    }
+}

extendify-sdk/loader.php

@@ -21,7 +21,10 @@ function extendifyCheckPluginInstalled($name)
             include_once ABSPATH . 'wp-admin/includes/plugin.php';
         }
 
-        foreach (get_plugins() as $plugin => $data) {
+        $plugins = get_plugins();
+        // Don't cache plugins this early.
+        wp_cache_delete('plugins', 'plugins');
+        foreach ($plugins as $plugin => $data) {
             if ($data['TextDomain'] === $name) {
                 return $plugin;
             }
@@ -37,7 +40,7 @@ function extendifyCheckPluginInstalled($name)
     // Remember, this file is only loaded by partner plugins.
     if (is_plugin_active($extendifyPluginName)) {
         // If the SDK is active then ignore the partner plugins.
-        $GLOBALS['extendify_sdk_partner'] = '';
+        $GLOBALS['extendify_sdk_partner'] = 'standalone';
         return false;
     }
 }

extendify-sdk/public/build/extendify.css

@@ -1,13 +1,17 @@
-=== Extendify ===
+=== Extendify — Gutenberg Patterns and Templates ===
 Contributors: extendify, richtabor, kbat82, clubkert, arturgrabo
-Tags: page builder, editor, patterns, drag-and-drop, blocks, visual editor, wysiwyg, design, website builder, landing page builder, front-end builder
+Tags: templates, patterns, layouts, blocks, gutenberg
 Requires at least: 5.4
 Tested up to: 5.9.0
-Stable tag: 0.4.0
+Stable tag: 0.6.0
 Requires PHP: 5.6
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
+The best WordPress templates, pattern, and layout library with 1,000+ designs built for the Gutenberg block editor.
+
+== Description ==
+
 Extendify is the platform of site design and creation tools for people that want to build a beautiful WordPress website with a library of patterns and full page layouts for the Gutenberg block editor.
 
 Make a beautiful WordPress website easier and faster than ever before with Extendify's library of Gutenberg block patterns, templates, and page layouts for Gutenberg.
@@ -120,6 +124,17 @@ Nope! Extendify imports lightweight block-based content that is served directly
 
 == Changelog ==
 
+= 0.6.0 - 2022-03-08 =
+- Add new design categories
+- Add ability to open library via search param
+- Tweak get_plugins call to not cache results
+- Improve toolbar on mobile
+
+= 0.5.0 - 2022-02-22 =
+- Add support for inverted style patterns
+- Improve library loading time
+- Add pattern library variants to open the library
+
 = 0.4.0 - 2022-02-08 =
 - Enhance layout view with autoscroll
 - Improve modal layout design consistency

extendify-sdk/public/build/extendify.js

@@ -31,6 +31,7 @@ function () {
 
         ApiRouter::get('/user', [UserController::class, 'show']);
         ApiRouter::post('/user', [UserController::class, 'store']);
+        ApiRouter::post('/clear-user', [UserController::class, 'delete']);
         ApiRouter::get('/user-meta', [UserController::class, 'meta']);
         ApiRouter::get('/max-free-imports', [UserController::class, 'maxImports']);
 

extendify-sdk/readme.txt

@@ -1,40 +1,50 @@
-import { useEffect, useCallback, useState } from '@wordpress/element'
-import { useGlobalStore } from './state/GlobalState'
-import { useUserStore } from './state/User'
-import { useTemplatesStore } from './state/Templates'
-import MainWindow from './pages/MainWindow'
-import './utility-control'
-import useTaxonomies from './hooks/useTaxonomies'
-import { General as GeneralApi } from './api/General'
+import { useEffect, useCallback } from '@wordpress/element'
+import { General as GeneralApi } from '@extendify/api/General'
+import MainWindow from '@extendify/pages/MainWindow'
+import { useGlobalStore } from '@extendify/state/GlobalState'
+import { useTemplatesStore } from '@extendify/state/Templates'
+import { useUserStore } from '@extendify/state/User'
+import '@extendify/utility-control'
+import { useTaxonomyStore } from './state/Taxonomies'
 
 export default function ExtendifyLibrary({ show = false }) {
     const open = useGlobalStore((state) => state.open)
+    const setReady = useGlobalStore((state) => state.setReady)
     const setOpen = useGlobalStore((state) => state.setOpen)
-    const [ready, setReady] = useState(false)
     const showLibrary = useCallback(() => setOpen(true), [setOpen])
     const hideLibrary = useCallback(() => setOpen(false), [setOpen])
     const initTemplateData = useTemplatesStore(
         (state) => state.initTemplateData,
     )
+    const fetchTaxonomies = useTaxonomyStore((state) => state.fetchTaxonomies)
 
     // When the uuid of the user comes back from the database, we can
     // assume that the state object is ready. This is important to check
     // as the library may be "open" when loaded, but not ready.
-    const userStoreReady = useUserStore((state) => state.uuid.length > 0)
-    const templatesStoreReady = useTemplatesStore(
+    const userHasHydrated = useUserStore((state) => state._hasHydrated)
+    const taxonomiesReady = useTemplatesStore(
         (state) => Object.keys(state.taxonomyDefaultState).length > 0,
     )
-    useTaxonomies(open)
 
     useEffect(() => {
-        if (userStoreReady && templatesStoreReady) {
+        if (!open) return
+        fetchTaxonomies().then(() => {
+            useTemplatesStore.getState().setupDefaultTaxonomies()
+        })
+    }, [open, fetchTaxonomies])
+
+    useEffect(() => {
+        if (userHasHydrated && taxonomiesReady) {
             initTemplateData()
             setReady(true)
         }
-    }, [userStoreReady, templatesStoreReady, initTemplateData])
+    }, [userHasHydrated, taxonomiesReady, initTemplateData, setReady])
 
     useEffect(() => {
-        show && setOpen(true)
+        const search = new URLSearchParams(window.location.search)
+        if (show || search.has('ext-open')) {
+            setOpen(true)
+        }
     }, [show, setOpen])
 
     useEffect(() => {
@@ -55,8 +65,5 @@ export default function ExtendifyLibrary({ show = false }) {
         }
     }, [hideLibrary, showLibrary])
 
-    if (!ready) {
-        return null
-    }
     return <MainWindow />
 }