@1771technologies/lytenyte-pro 1.0.0-beta.14 → 1.0.0-beta.16

package/dist/cell-selection/update-additive-cell-selection.js

@@ -7,7 +7,6 @@ export function updateAdditiveCellSelection(grid, rect) {
     const ds = grid.state.rowDataStore;
     const rowTopCount = ds.rowTopCount.get();
     const adjustedRect = adjustRectForRowAndCellSpan(grid, rect);
-    console.log(adjustedRect);
     const rects = splitCellSelectionRect({
         rect: boundSelectionRect(grid, adjustedRect),
         colCenterCount: s.columnVisibleCenterCount,
@@ -15,7 +14,6 @@ export function updateAdditiveCellSelection(grid, rect) {
         rowCenterCount: ds.rowCenterCount.get(),
         rowTopCount: rowTopCount,
     });
-    console.log(rects);
     const current = grid.internal.cellSelectionAdditiveRects.get();
     if (current && current.length === rects.length) {
         if (current.every((c, i) => areRectsEqual(c, rects[i])))

package/dist/column-manager/branch.js

@@ -21,8 +21,10 @@ export const Branch = forwardRef(function Branch({ item, label, ...props }, forw
     }, [columns, grid.api, isVisible]);
     return (_jsx(ColumnItemContext, { value: useMemo(() => ({ item }), [item]), children: _jsx(TreeBranch, { ...props, itemId: item.branch.data.idOccurrence, ref: forwarded, ...item.attrs, onKeyDown: (ev) => {
                 props.onKeyDown?.(ev);
-                if (ev.key === " ")
+                if (ev.key === " ") {
                     toggle();
+                    ev.preventDefault();
+                }
             }, labelWrap: _jsx(DropWrap, { "data-ln-column-manager-branch": true, "data-ln-column-id": item.branch.data.idOccurrence, accepted: [accepted], onEnter: (el) => {
                     const data = dragState.data
                         .get()
@@ -38,7 +40,8 @@ export const Branch = forwardRef(function Branch({ item, label, ...props }, forw
                         return;
                     const thisIndex = allColumns.findIndex((c) => c.id === columns[0].id);
                     const isBefore = thisIndex > moveIndex;
-                    if (isBefore) {
+                    // Flipped since our source is the one moving
+                    if (!isBefore) {
                         el.setAttribute("data-ln-is-before", "true");
                     }
                     else {

package/dist/column-manager/leaf.js

@@ -38,7 +38,8 @@ export const Leaf = forwardRef(function ColumnManagerLeaf({ item, ...props }, fo
                     return;
                 const thisIndex = allColumns.findIndex((c) => c.id === columns[0].id);
                 const isBefore = thisIndex > moveIndex;
-                if (isBefore) {
+                // Flipped since our source is the one moving
+                if (!isBefore) {
                     el.setAttribute("data-ln-is-before", "true");
                 }
                 else {
@@ -51,6 +52,7 @@ export const Leaf = forwardRef(function ColumnManagerLeaf({ item, ...props }, fo
                     props.onKeyDown?.(ev);
                     if (ev.key === " ") {
                         toggle();
+                        ev.preventDefault();
                     }
                 }, "data-ln-column-manager-leaf": true, "data-ln-column-id": item.leaf.data.id }) }) }));
 });

package/dist/grid-box/item.js

@@ -4,7 +4,7 @@ import { Item } from "../listbox/item";
 import { dragState, DropWrap, useDraggable } from "@1771technologies/lytenyte-dragon";
 import { useCombinedRefs, useSlot, } from "@1771technologies/lytenyte-react-hooks";
 import { useGridBoxContext } from "./context";
-export const BoxItem = forwardRef(function BoxItem({ item, itemAs, itemClassName, itemStyle, ...props }, forwarded) {
+export const BoxItem = forwardRef(function BoxItem({ item, itemAs, itemClassName, itemStyle, children, ...props }, forwarded) {
     const { accepted } = useGridBoxContext();
     const { dragProps } = useDraggable({
         getItems: () => {
@@ -19,17 +19,19 @@ export const BoxItem = forwardRef(function BoxItem({ item, itemAs, itemClassName
     const renderer = useSlot({
         props: [
             {
-                children: (_jsx(Item, { ...props, ...extraProps, onKeyDown: (ev) => {
-                        if (ev.key === " ")
+                children: (_jsx(Item, { ...extraProps, onKeyDown: (ev) => {
+                        if (ev.key === " ") {
                             item.onAction?.(ev.currentTarget);
+                            ev.preventDefault();
+                        }
                         if (ev.key === "Backspace" || ev.key === "Delete")
                             item.onDelete?.(ev.currentTarget);
-                    }, onClick: (ev) => item.onAction(ev.currentTarget), className: itemClassName, style: itemStyle })),
+                    }, onClick: (ev) => item.onAction(ev.currentTarget), className: itemClassName, style: itemStyle, "data-ln-source": item.source, "data-ln-index": item.index, children: children })),
             },
         ],
         slot: itemAs ?? _jsx("div", {}),
     });
-    return (_jsx(DropWrap, { onEnter: (e) => {
+    return (_jsx(DropWrap, { ...props, onEnter: (e) => {
             const data = dragState.active.get();
             const thisSource = e.getAttribute("data-ln-source");
             const dragSource = data?.getAttribute("data-ln-source");
@@ -39,11 +41,11 @@ export const BoxItem = forwardRef(function BoxItem({ item, itemAs, itemClassName
                 e.setAttribute("data-ln-is-after", "true");
                 return;
             }
-            const thisIndex = Number.parseInt(e.getAttribute("data-ln-index"));
-            const dragIndex = Number.parseInt(e.getAttribute("data-ln-index"));
-            if (Number.isNaN(dragIndex) || Number.isNaN(thisIndex))
+            const overIndex = Number.parseInt(e.getAttribute("data-ln-index"));
+            const dragIndex = Number.parseInt(data.getAttribute("data-ln-index"));
+            if (Number.isNaN(dragIndex) || Number.isNaN(overIndex) || overIndex === dragIndex)
                 return;
-            if (thisIndex < dragIndex) {
+            if (overIndex < dragIndex) {
                 e.setAttribute("data-ln-is-before", "true");
             }
             else {
@@ -52,5 +54,10 @@ export const BoxItem = forwardRef(function BoxItem({ item, itemAs, itemClassName
         }, onLeave: (el) => {
             el.removeAttribute("data-ln-is-before");
             el.removeAttribute("data-ln-is-after");
-        }, "data-ln-source": item.source, "data-ln-index": item.index, accepted: accepted, onDrop: item.onDrop, as: renderer }));
+        }, "data-ln-source": item.source, "data-ln-index": item.index, accepted: accepted, onDrop: (e) => {
+            const el = e.dropElement;
+            el.removeAttribute("data-ln-is-before");
+            el.removeAttribute("data-ln-is-after");
+            item.onDrop(e);
+        }, as: renderer }));
 });

package/dist/grid-box/use-column-box-items.js

@@ -37,16 +37,13 @@ export function useColumnBoxItems({ grid, onRootDrop, onDrop, onDelete, onAction
                 onAction: (el) => onAction?.({ column: c, el }),
                 onDelete: (el) => onDelete?.({ column: c, el }),
                 onDrop: (p) => {
-                    const target = c;
                     const src = p.state.siteLocalData?.[columnId];
-                    const isRtl = grid.state.rtl.get();
-                    let isBefore;
-                    if (orientation === "horizontal") {
-                        isBefore = isRtl ? !p.moveState.leftHalf : p.moveState.leftHalf;
-                    }
-                    else {
-                        isBefore = p.moveState.topHalf;
-                    }
+                    const target = c;
+                    const dragIndex = columns.findIndex((x) => x.id === src.id);
+                    const overIndex = columns.findIndex((x) => x.id === c.id);
+                    const isBefore = overIndex < dragIndex;
+                    if (overIndex === dragIndex)
+                        return;
                     onDrop?.({ src, target, isBefore });
                 },
             };
@@ -58,13 +55,11 @@ export function useColumnBoxItems({ grid, onRootDrop, onDrop, onDelete, onAction
         columns,
         dragPlaceholder,
         draggable,
-        grid.state.rtl,
         gridId,
         itemFilter,
         onAction,
         onDelete,
         onDrop,
-        orientation,
     ]);
     const onRootDropEv = useEvent((p) => {
         const columnId = `${gridId}-column`;

package/dist/grid-box/use-row-group-box-items.js

@@ -13,14 +13,11 @@ export function useRowGroupBoxItems({ grid, orientation, dragPlaceholder, hideCo
             const onDrop = (p) => {
                 const target = c;
                 const src = p.state.siteLocalData?.[groupId];
-                const isRtl = grid.state.rtl.get();
-                let isBefore;
-                if (orientation === "horizontal") {
-                    isBefore = isRtl ? !p.moveState.leftHalf : p.moveState.leftHalf;
-                }
-                else {
-                    isBefore = p.moveState.topHalf;
-                }
+                const overIndex = rowGroupModel.findIndex((x) => x === c);
+                const dragIndex = rowGroupModel.findIndex((x) => x === src);
+                const isBefore = overIndex < dragIndex;
+                if (overIndex === dragIndex)
+                    return;
                 const srcIndex = rowGroupModel.findIndex((x) => {
                     if (typeof src !== typeof x)
                         return;
@@ -88,10 +85,8 @@ export function useRowGroupBoxItems({ grid, orientation, dragPlaceholder, hideCo
     }, [
         grid.api,
         grid.state.rowGroupModel,
-        grid.state.rtl,
         gridId,
         hideColumnOnGroup,
-        orientation,
         dragPlaceholder,
         rowGroupModel,
     ]);

package/dist/listbox/item.js

@@ -9,6 +9,7 @@ export const Item = forwardRef(function Item(props, forwarded) {
             const prev = ctx.rtl ? "ArrowRight" : "ArrowLeft";
             if (ev.key !== next && ev.key !== prev)
                 return;
+            ev.preventDefault();
             const items = getTabbables(ev.currentTarget);
             if (!items.length)
                 return;
@@ -18,7 +19,6 @@ export const Item = forwardRef(function Item(props, forwarded) {
             const itemToFocus = items[nextIndex];
             if (!itemToFocus)
                 return;
-            ev.preventDefault();
             ev.stopPropagation();
             itemToFocus.focus();
         }, ref: forwarded, tabIndex: 0, "data-ln-listbox-item": true }));

package/dist/tree-view/leaf.js

@@ -13,6 +13,7 @@ export const TreeLeaf = forwardRef(function TreeLeaf({ itemId, ...props }, forwa
                 e.ctrlKey ||
                 e.shiftKey)
                 return;
+            e.preventDefault();
             const nodes = getFocusables(e.currentTarget);
             const index = nodes.indexOf(document.activeElement);
             if (index === -1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@1771technologies/lytenyte-pro",
   "description": "Blazingly fast headless React data grid with 100s of features.",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.16",
   "type": "module",
   "license": "COMMERCIAL",
   "files": [
@@ -49,12 +49,12 @@
   },
   "dependencies": {
     "@1771technologies/atom": "^1.0.2",
-    "@1771technologies/lytenyte-dragon": "1.0.0-beta.14",
-    "@1771technologies/lytenyte-js-utils": "1.0.0-beta.14",
-    "@1771technologies/lytenyte-react-hooks": "1.0.0-beta.14",
-    "@1771technologies/lytenyte-dom-utils": "1.0.0-beta.14",
-    "@1771technologies/lytenyte-core": "1.0.0-beta.14",
-    "@1771technologies/lytenyte-shared": "1.0.0-beta.14"
+    "@1771technologies/lytenyte-js-utils": "1.0.0-beta.16",
+    "@1771technologies/lytenyte-dom-utils": "1.0.0-beta.16",
+    "@1771technologies/lytenyte-core": "1.0.0-beta.16",
+    "@1771technologies/lytenyte-dragon": "1.0.0-beta.16",
+    "@1771technologies/lytenyte-shared": "1.0.0-beta.16",
+    "@1771technologies/lytenyte-react-hooks": "1.0.0-beta.16"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",