@measured/puck-plugin-heading-analyzer 0.14.2-canary.25a7c4b → 0.14.2-canary.2743a73

package/dist/index.js

@@ -35956,20 +35956,22 @@ function offsetPoint(x, y, win) {
   let offsetY = 0;
   if (win.parent !== win.self) {
     const iframe = win.frameElement;
-    const rect = iframe.getBoundingClientRect();
-    const transform = getTransform(iframe);
-    offsetX = rect.left;
-    offsetY = rect.top;
-    if (transform) {
-      const {
-        x: transformedX,
-        y: transformedY
-      } = applyTransformPoint(x, y, transform.matrix, transform.origin);
-      const point2 = {
-        x: transformedX + offsetX,
-        y: transformedY + offsetY
-      };
-      return point2;
+    if (iframe) {
+      const rect = iframe.getBoundingClientRect();
+      const transform = getTransform(iframe);
+      offsetX = rect.left;
+      offsetY = rect.top;
+      if (transform) {
+        const {
+          x: transformedX,
+          y: transformedY
+        } = applyTransformPoint(x, y, transform.matrix, transform.origin);
+        const point2 = {
+          x: transformedX + offsetX,
+          y: transformedY + offsetY
+        };
+        return point2;
+      }
     }
   }
   const point = {
@@ -41050,7 +41052,7 @@ var init_dnd_esm = __esm({
       }
       if (!el.parentElement) {
         const refWindow = el.ownerDocument.defaultView;
-        if (refWindow && refWindow.self !== refWindow.parent) {
+        if (refWindow && refWindow.self !== refWindow.parent && refWindow.frameElement) {
           const iframe = refWindow.frameElement;
           return findNearestTransform(iframe);
         }
@@ -41172,7 +41174,7 @@ var init_dnd_esm = __esm({
     }) => {
       const el = querySelectorAllIframe(`[data-rfd-draggable-id="${state.critical.draggable.id}"]`)[0];
       const win = (el == null ? void 0 : el.ownerDocument.defaultView) || window;
-      const isInIframe = win !== window;
+      const isInIframe = win !== window && win.frameElement;
       if (isInIframe) {
         const iframe = win.frameElement;
         const viewportBox = getBox(iframe);
@@ -45905,7 +45907,10 @@ var require_dist = __commonJS({
       return collected;
     };
     var getStyleSheet = (el) => {
-      return Array.from(document.styleSheets).find((ss) => ss.ownerNode === el);
+      return Array.from(document.styleSheets).find((ss) => {
+        const ownerNode = ss.ownerNode;
+        return ownerNode.href === el.href;
+      });
     };
     var getStyles2 = (styleSheet) => {
       if (styleSheet) {
@@ -45920,38 +45925,36 @@ var require_dist = __commonJS({
       }
       return "";
     };
+    var defer = (fn) => setTimeout(fn, 0);
     var CopyHostStyles = ({
       children,
       debug = false,
       onStylesLoaded = () => null
     }) => {
       const { document: doc, window: win } = (0, import_react_frame_component.useFrame)();
-      (0, import_react22.useLayoutEffect)(() => {
+      (0, import_react22.useEffect)(() => {
         if (!win || !doc) {
           return () => {
           };
         }
-        const elements = [];
+        let elements = [];
+        const hashes = {};
         const lookupEl = (el) => elements.findIndex((elementMap) => elementMap.original === el);
-        const addEl = (el, onLoad = () => {
+        const mirrorEl = (el, onLoad = () => {
         }) => __async2(void 0, null, function* () {
-          const index = lookupEl(el);
-          if (index > -1) {
-            if (debug)
-              console.log(
-                `Tried to add an element that was already mirrored. Updating instead...`
-              );
-            elements[index].mirror.innerText = el.innerText;
-            onLoad();
-            return;
-          }
           let mirror;
           if (el.nodeName === "LINK") {
             mirror = document.createElement("style");
             mirror.type = "text/css";
             let styleSheet = getStyleSheet(el);
             if (!styleSheet) {
-              yield new Promise((resolve) => el.onload = resolve);
+              yield new Promise((resolve) => {
+                const fn = () => {
+                  resolve();
+                  el.removeEventListener("load", fn);
+                };
+                el.addEventListener("load", fn);
+              });
               styleSheet = getStyleSheet(el);
             }
             const styles = getStyles2(styleSheet);
@@ -45961,7 +45964,6 @@ var require_dist = __commonJS({
                   `Tried to load styles for link element, but couldn't find them. Skipping...`
                 );
               }
-              onLoad();
               return;
             }
             mirror.innerHTML = styles;
@@ -45969,11 +45971,28 @@ var require_dist = __commonJS({
           } else {
             mirror = el.cloneNode(true);
           }
+          mirror.onload = onLoad;
+          return mirror;
+        });
+        const addEl = (el, onLoad = () => {
+        }) => __async2(void 0, null, function* () {
+          const index = lookupEl(el);
+          if (index > -1) {
+            if (debug)
+              console.log(
+                `Tried to add an element that was already mirrored. Updating instead...`
+              );
+            elements[index].mirror.innerText = el.innerText;
+            onLoad();
+            return;
+          }
+          const mirror = yield mirrorEl(el, onLoad);
+          if (!mirror) {
+            onLoad();
+            return;
+          }
           const elHash = (0, import_object_hash.default)(mirror.outerHTML);
-          const existingHashes = collectStyles(doc).map(
-            (existingStyle) => existingStyle !== mirror && (0, import_object_hash.default)(existingStyle.outerHTML)
-          ).filter(Boolean);
-          if (existingHashes.indexOf(elHash) > -1) {
+          if (hashes[elHash]) {
             if (debug)
               console.log(
                 `iframe already contains element that is being mirrored. Skipping...`
@@ -45981,6 +46000,7 @@ var require_dist = __commonJS({
             onLoad();
             return;
           }
+          hashes[elHash] = true;
           mirror.onload = onLoad;
           doc.head.append(mirror);
           elements.push({ original: el, mirror });
@@ -45988,6 +46008,7 @@ var require_dist = __commonJS({
             console.log(`Added style node ${el.outerHTML}`);
         });
         const removeEl = (el) => {
+          var _a3, _b;
           const index = lookupEl(el);
           if (index === -1) {
             if (debug)
@@ -45996,7 +46017,9 @@ var require_dist = __commonJS({
               );
             return;
           }
-          elements[index].mirror.remove();
+          const elHash = (0, import_object_hash.default)(el.outerHTML);
+          (_b = (_a3 = elements[index]) == null ? void 0 : _a3.mirror) == null ? void 0 : _b.remove();
+          delete hashes[elHash];
           if (debug)
             console.log(`Removed style node ${el.outerHTML}`);
         };
@@ -46007,7 +46030,7 @@ var require_dist = __commonJS({
                 if (node.nodeType === Node.TEXT_NODE || node.nodeType === Node.ELEMENT_NODE) {
                   const el = node.nodeType === Node.TEXT_NODE ? node.parentElement : node;
                   if (el && el.matches(styleSelector)) {
-                    addEl(el);
+                    defer(() => addEl(el));
                   }
                 }
               });
@@ -46015,7 +46038,7 @@ var require_dist = __commonJS({
                 if (node.nodeType === Node.TEXT_NODE || node.nodeType === Node.ELEMENT_NODE) {
                   const el = node.nodeType === Node.TEXT_NODE ? node.parentElement : node;
                   if (el && el.matches(styleSelector)) {
-                    removeEl(el);
+                    defer(() => removeEl(el));
                   }
                 }
               });
@@ -46024,16 +46047,35 @@ var require_dist = __commonJS({
         });
         const parentDocument = win.parent.document;
         const collectedStyles = collectStyles(parentDocument);
-        let mountedCounter = 0;
-        collectedStyles.forEach((styleNode) => {
-          addEl(styleNode, () => {
-            mountedCounter += 1;
-            if (mountedCounter === collectedStyles.length) {
-              onStylesLoaded();
+        const hrefs = [];
+        Promise.all(
+          collectedStyles.map((styleNode, i2) => __async2(void 0, null, function* () {
+            if (styleNode.nodeName === "LINK") {
+              const linkHref = styleNode.href;
+              if (hrefs.indexOf(linkHref) > -1) {
+                return;
+              }
+              hrefs.push(linkHref);
             }
+            const mirror = yield mirrorEl(styleNode);
+            if (!mirror)
+              return;
+            elements.push({ original: styleNode, mirror });
+            return mirror;
+          }))
+        ).then((mirrorStyles) => {
+          const filtered = mirrorStyles.filter(
+            (el) => typeof el !== "undefined"
+          );
+          doc.head.innerHTML = "";
+          doc.head.append(...filtered);
+          observer.observe(parentDocument.head, { childList: true, subtree: true });
+          filtered.forEach((el) => {
+            const elHash = (0, import_object_hash.default)(el.outerHTML);
+            hashes[elHash] = true;
           });
+          onStylesLoaded();
         });
-        observer.observe(parentDocument.head, { childList: true, subtree: true });
         return () => {
           observer.disconnect();
         };
@@ -78320,7 +78362,7 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
                       onChange(e2.currentTarget.value);
                     },
                     disabled: readOnly,
-                    defaultChecked: value === option.value
+                    checked: value === option.value
                   }
                 ),
                 /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName14("radioInner"), children: option.label || option.value })
@@ -79615,7 +79657,8 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
       viewports = defaultViewports2,
       iframe = {
         enabled: true
-      }
+      },
+      dnd
     }) {
       var _a3;
       const historyStore = useHistoryStore();
@@ -79815,6 +79858,7 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
           children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
             DragDropContext2,
             {
+              autoScrollerOptions: { disabled: dnd == null ? void 0 : dnd.disableAutoScroll },
               onDragUpdate: (update2) => {
                 setDraggedItem(__spreadValues2(__spreadValues2({}, draggedItem), update2));
                 onDragStartOrUpdate(update2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck-plugin-heading-analyzer",
-  "version": "0.14.2-canary.25a7c4b",
+  "version": "0.14.2-canary.2743a73",
   "author": "Measured Corporation Ltd <hello@measured.co>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",
@@ -18,7 +18,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@measured/puck": "^0.14.2-canary.25a7c4b",
+    "@measured/puck": "^0.14.2-canary.2743a73",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
     "eslint": "^7.32.0",