Merge branch 'main' into release

reearth · Sep 24, 2024 · 0e53590 · 0e53590
2 parents 6df7fc4 + d428b46
commit 0e53590
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/web/src/beta/features/Editor/Publish/PublishToolsPanel/hooks.ts b/web/src/beta/features/Editor/Publish/PublishToolsPanel/hooks.ts
@@ -72,10 +72,7 @@ export default ({
   const generateAlias = useCallback(() => generateRandomString(10), []);
 
   const [validAlias, setValidAlias] = useState(false);
-  const alias = useMemo(
-    () => project?.alias ?? generateAlias(),
-    [project?.alias, generateAlias]
-  );
+  const [alias, setAlias] = useState<string>(project?.alias ?? generateAlias());
 
   const [
     checkProjectAlias,
@@ -110,6 +107,17 @@ export default ({
     [project?.alias, checkProjectAlias]
   );
 
+  useEffect(() => {
+    if (modalOpen) {
+      if (!alias) {
+        const generatedAlias = generateAlias();
+        setAlias(generatedAlias);
+      }
+
+      handleProjectAliasCheck(alias);
+    }
+  }, [modalOpen, alias, generateAlias, handleProjectAliasCheck]);
+
   useEffect(() => {
     setValidAlias(
       !validatingAlias &&

diff --git a/web/src/beta/features/Visualizer/Crust/Plugins/PluginFrame/SafeIFrame/hooks.ts b/web/src/beta/features/Visualizer/Crust/Plugins/PluginFrame/SafeIFrame/hooks.ts
@@ -153,10 +153,8 @@ export default function useHook({
           const st = win.getComputedStyle(html, "");
           horizontalMargin = parseInt(st.getPropertyValue("margin-left"), 10) + parseInt(st.getPropertyValue("margin-right"), 10);
           verticalMargin = parseInt(st.getPropertyValue("margin-top"), 10) + parseInt(st.getPropertyValue("margin-bottom"), 10);
-          const horizontalScrollbarHeight = window.innerHeight - document.documentElement.clientHeight;
-          const verticalScrollbarWidth = window.innerWidth - document.documentElement.clientWidth;
-          const width = html.offsetWidth + horizontalMargin + verticalScrollbarWidth;
-          const height = html.offsetHeight + verticalMargin + horizontalScrollbarHeight;
+          const width = html.offsetWidth + horizontalMargin;
+          const height = html.offsetHeight + verticalMargin;
           if(parent){
             parent.postMessage({
               [${JSON.stringify(autoResizeMessageKey)}]: { width, height }

diff --git a/web/src/beta/features/Visualizer/Crust/index.tsx b/web/src/beta/features/Visualizer/Crust/index.tsx
@@ -325,6 +325,7 @@ export default function Crust({
         ref={pluginPopupContainerRef}
       />
       <Infobox
+        key={featuredInfobox?.featureId}
         infobox={featuredInfobox}
         installableInfoboxBlocks={installableInfoboxBlocks}
         isEditable={!!inEditor && !featuredInfobox?.readOnly}