fix: floating tool created outside the window when it was on the edge (…

…#222)
josStorer · Apr 21, 2023 · da33ca7 · da33ca7
1 parent 4d9479b
commit da33ca7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/src/components/FloatingToolbar/index.jsx b/src/components/FloatingToolbar/index.jsx
@@ -23,7 +23,16 @@ function FloatingToolbar(props) {
   const windowSize = useClampWindowSize([750, 1500], [0, Infinity])
   const config = useConfig(() => {
     setRender(true)
-    if (!triggered) props.container.style.position = 'absolute'
+    if (!triggered) {
+      props.container.style.position = 'absolute'
+      setTimeout(() => {
+        const left = Math.min(
+          Math.max(0, window.innerWidth - props.container.offsetWidth - 30),
+          Math.max(0, position.x),
+        )
+        props.container.style.left = left + 'px'
+      })
+    }
   })
 
   useEffect(() => {

diff --git a/src/content-script/index.jsx b/src/content-script/index.jsx
@@ -126,6 +126,19 @@ const deleteToolbar = () => {
     toolbarContainer.remove()
 }
 
+const createSelectionTools = (toolbarContainer, selection) => {
+  toolbarContainer.className = 'chatgptbox-toolbar-container'
+  render(
+    <FloatingToolbar
+      session={initSession()}
+      selection={selection}
+      container={toolbarContainer}
+      dockable={true}
+    />,
+    toolbarContainer,
+  )
+}
+
 async function prepareForSelectionTools() {
   document.addEventListener('mouseup', (e) => {
     if (toolbarContainer && toolbarContainer.contains(e.target)) return
@@ -154,16 +167,7 @@ async function prepareForSelectionTools() {
           position = { x: e.pageX + 20, y: e.pageY + 20 }
         }
         toolbarContainer = createElementAtPosition(position.x, position.y)
-        toolbarContainer.className = 'chatgptbox-toolbar-container'
-        render(
-          <FloatingToolbar
-            session={initSession()}
-            selection={selection}
-            container={toolbarContainer}
-            dockable={true}
-          />,
-          toolbarContainer,
-        )
+        createSelectionTools(toolbarContainer, selection)
       }
     })
   })
@@ -207,16 +211,7 @@ async function prepareForSelectionToolsTouch() {
           e.changedTouches[0].pageX + 20,
           e.changedTouches[0].pageY + 20,
         )
-        toolbarContainer.className = 'chatgptbox-toolbar-container'
-        render(
-          <FloatingToolbar
-            session={initSession()}
-            selection={selection}
-            container={toolbarContainer}
-            dockable={true}
-          />,
-          toolbarContainer,
-        )
+        createSelectionTools(toolbarContainer, selection)
       }
     })
   })