@social-mail/social-mail-client 1.8.343 → 1.8.344

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.8.343",
+  "version": "1.8.344",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/site-editor/editor/ui/SelectionUI.tsx

@@ -233,14 +233,9 @@ const eventPointerDown = (editor: HtmlPageEditor, e: PointerEvent) =>  {
     const element = e.target as HTMLElement;
     const currentElement = e.currentTarget as HTMLElement;
     if (!currentElement.hasAttribute("data-edit")) {
-        setTimeout(() => currentElement.hasAttribute("data-edit")
-            ? currentElement.focus({ preventScroll: true })
-            : void 0, 250);
         return;
     }
 
-    currentElement.focus({ preventScroll: true });
-
     const resize = element.getAttribute("data-resize");
     if (resize) {
 
@@ -303,6 +298,12 @@ const eventKeyDown = (editor: HtmlPageEditor, e: KeyboardEvent) => {
     if (!currentElement.hasAttribute("data-edit")) {
         return;
     }
+
+    let sc: ReturnType<typeof beginDrag> = currentElement[keyboardEditingSymbol];
+    if (sc) {
+        return;
+    }
+
     // e.preventDefault();
 
     let dx = 0;
@@ -311,63 +312,71 @@ const eventKeyDown = (editor: HtmlPageEditor, e: KeyboardEvent) => {
     switch(e.key) {
         case "ArrowDown":
             // Do something for "down arrow" key press.
-            dy = e.repeat ? 5 : 1;
+            dy = 1;
             break;
         case "ArrowUp":
             // Do something for "up arrow" key press.
-            dy = e.repeat ? -5 : -1;
+            dy = -1;
             break;
         case "ArrowLeft":
             // Do something for "left arrow" key press.
-            dx = e.repeat ? -5 : -1;
+            dx = -1;
             break;
         case "ArrowRight":
             // Do something for "right arrow" key press.
-            dx = e.repeat ? 5 : 1;
+            dx = 1;
             break;
         default:
             return;
     }
 
-    let sc: ReturnType<typeof beginDrag> = currentElement[keyboardEditingSymbol];
+    const sx = dx * 5;
+    const sy = dy * 5;
 
-    if(!sc) {
+    const fx = (r) => {
+        r.top += r.dy;
+        r.left += r.dx;
+        r.bottom -= r.dy;
+        r.right -= r.dx;
+        r.move = true;
+        return r;
+    };
 
-        const fx = (r) => {
-            r.top += r.dy;
-            r.left += r.dx;
-            r.bottom -= r.dy;
-            r.right -= r.dx;
-            r.move = true;
-            return r;
-        };
+    sc = beginDrag(editor, element);
+    currentElement[keyboardEditingSymbol] = sc;
 
-        sc = beginDrag(editor, element);
-        currentElement[keyboardEditingSymbol] = sc;
+    sc.move({ dx, dy, fx });
 
+    const timer = setInterval(() => {
+        dx += sx;
+        dy += sy;
         sc.move({ dx, dy, fx });
+    }, 250);
 
-        const timer = setInterval(() =>
-            sc.move({ dx, dy, fx })
-        , 250);
 
+    const release = () => {
+        clearInterval(timer);
+        currentElement[keyboardEditingSymbol] = void 0;
+        currentElement.removeEventListener("keyup", release);
+        sc.commit();
+    };
+    currentElement.addEventListener("keyup", release);
 
-        const release = () => {
-            clearInterval(timer);
-            currentElement[keyboardEditingSymbol] = void 0;
-            currentElement.removeEventListener("keyup", release);
-            sc.commit();
-        };
-        currentElement.addEventListener("keyup", release);
-    }
 
 };
 
+const updateFocus = (e, b) => {
+    if (b) {
+        e.focus();
+    }
+    return b;
+};
+
 export function SelectionUI() {
     return <selected-element data-element="selection"
         tabIndex="-1"
-        data-edit={BindEditor.oneWay((e) => /relative/i.test(e.selection.parentStyle.position)
-            && /absolute|fixed/i.test(e.selection.currentStyle.position) ? "1" : null)}
+        data-edit={BindEditor.oneWay((editor,e) => updateFocus(e, /relative/i.test(editor.selection.parentStyle.position)
+            && /absolute|fixed/i.test(editor.selection.currentStyle.position) ? "1" : null))}
         event-pointerdown={BindEditor.event(eventPointerDown as any)}
         event-keydown={BindEditor.event(eventKeyDown as any)}
         style-left={BindEditor.oneWay((e) => e.selection.left)}