@witchcraft/layout 0.5.2 → 0.5.3

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@witchcraft/layout",
   "configKey": "witchcraftLayout",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/runtime/composables/useFrames.js

@@ -208,9 +208,14 @@ export function useFrames(win, handler) {
   function cancel() {
     moveEnd(void 0, { apply: false });
   }
-  function resolve({ apply, result: value }) {
+  function resolve({ updateEdges, result: value }) {
     moveResult = value;
-    moveEnd(void 0, { apply });
+    if (updateEdges) {
+      for (const frame of touchingFramesArrays.value.flat()) {
+        win.value.frames[frame.id] = frame;
+      }
+    }
+    controller?.abort();
   }
   const keydownController = new AbortController();
   const wrappedKeydownHandler = (e) => {

package/dist/runtime/types/index.d.ts

@@ -1929,7 +1929,7 @@ export interface IAction {
     onMoveChange: <T extends "start" | "move" | "end">(type: T, e: T extends "end" ? PointerEvent | undefined : PointerEvent, state: MoveState, forceRecalculateEdges: () => void, 
     /** Calls moveEnd with updateEdges: false. This can technically be called from "end", it should still work. */
     cancel: (e: PointerEvent | KeyboardEvent | undefined, state: MoveState) => void, 
-    /** Saves result to resolve moveStart promise with then calls moveEnd with given apply. Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
+    /** Saves result to resolve moveStart promise, updates edges if you passed updateEdges then aborts the handler (only onMoveEnded will fire after) . Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
     resolve: T extends "end" ? undefined : ((opts: ActionResolve) => void)) => ActionChangeResult;
     /**
      * Is called after `onMoveChange("end")` with the same event. Will not be called if the request was cancelled.
@@ -2010,10 +2010,7 @@ export type ActionHandlerApplyResult = {
 export type ActionApplyResult = ActionHandlerApplyResult & {
     wasApplied: boolean;
 };
-export type ActionResolve = {
-    apply: boolean;
-    result?: any;
-};
+export type ActionResolve = ActionHandlerApplyResult;
 /**
  * Handler interface for drag actions.
  */
@@ -2029,15 +2026,12 @@ export interface IActionHandler {
      * - onMoveChange("move", ...)
      * - onMoveChange("end", ...)
      * - onMoveApply(...) (IF moveEnd was called with apply: true, otherwise this is skipped)
-     * 	- If anything calls cancel or resolve they call onMoveApply (cancel with apply: false, resolve with whatever apply value you gave it).
-     * - onMoveEnded() // do cleanup here
-     *
-     * Note also that resolve just resolves the promise value (after onMoveApply("end") and before onMoveEnded()). Depending on what you're doing you might still have to apply the result, remember onMoveApply will still be called if you do `resolve({ apply:true })`.
+     * - onMoveEnded() // do cleanup here, always called at the very end
      */
     onMoveChange<T extends "start" | "move" | "end">(type: T, e: T extends "end" ? PointerEvent | undefined : PointerEvent, state: MoveState, forceRecalculateEdges: () => void, 
     /** Calls moveEnd with apply: false. This can technically be called from "end", it should still work. */
     cancel: (e: PointerEvent | KeyboardEvent | undefined, state: MoveState) => void, 
-    /** Saves result to resolve moveStart promise with then calls moveEnd with given apply. Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
+    /** Saves result to resolve moveStart promise, updates edges if you passed updateEdges then aborts the handler (only onMoveEnded will fire after) . Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
     resolve: T extends "end" ? undefined : ((opts: ActionResolve) => void)): MoveChangeResult;
     /**
      * Called when drag will be applied. If moveEnd was called with apply false, it will not be called.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@witchcraft/layout",
   "description": "Headless layout manager.",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "main": "./dist/runtime/index.js",
   "type": "module",
   "sideEffects": false,

package/src/runtime/composables/useFrames.ts

@@ -281,10 +281,15 @@ export function useFrames(
 	function cancel(): void {
 		moveEnd(undefined, { apply: false })
 	}
-	// we use apply not updateEdges, updateEdges needs to be returned by onMoveApply
-	function resolve({ apply, result: value }: ActionResolve): void {
+	function resolve({ updateEdges, result: value }: ActionResolve): void {
 		moveResult = value
-		moveEnd(undefined, { apply })
+
+		if (updateEdges) {
+			for (const frame of touchingFramesArrays.value.flat()) {
+				win!.value.frames[frame.id] = frame
+			}
+		}
+		controller?.abort()
 	}
 
 	const keydownController = new AbortController()

package/src/runtime/types/index.ts

@@ -536,7 +536,7 @@ export interface IAction {
 		forceRecalculateEdges: () => void,
 		/** Calls moveEnd with updateEdges: false. This can technically be called from "end", it should still work. */
 		cancel: (e: PointerEvent | KeyboardEvent | undefined, state: MoveState) => void,
-		/** Saves result to resolve moveStart promise with then calls moveEnd with given apply. Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
+		/** Saves result to resolve moveStart promise, updates edges if you passed updateEdges then aborts the handler (only onMoveEnded will fire after) . Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
 		resolve: T extends "end" ? undefined : ((opts: ActionResolve) => void)
 	) => ActionChangeResult
 	/**
@@ -621,7 +621,7 @@ export type ActionHandlerApplyResult = {
 
 export type ActionApplyResult = ActionHandlerApplyResult & { wasApplied: boolean }
 
-export type ActionResolve = { apply: boolean, result?: any }
+export type ActionResolve = ActionHandlerApplyResult
 
 /**
  * Handler interface for drag actions.
@@ -640,10 +640,7 @@ export interface IActionHandler {
 	 * - onMoveChange("move", ...)
 	 * - onMoveChange("end", ...)
 	 * - onMoveApply(...) (IF moveEnd was called with apply: true, otherwise this is skipped)
-	 * 	- If anything calls cancel or resolve they call onMoveApply (cancel with apply: false, resolve with whatever apply value you gave it).
-	 * - onMoveEnded() // do cleanup here
-	 *
-	 * Note also that resolve just resolves the promise value (after onMoveApply("end") and before onMoveEnded()). Depending on what you're doing you might still have to apply the result, remember onMoveApply will still be called if you do `resolve({ apply:true })`.
+	 * - onMoveEnded() // do cleanup here, always called at the very end
 	 */
 	onMoveChange<T extends "start" | "move" | "end">(
 		type: T,
@@ -652,7 +649,7 @@ export interface IActionHandler {
 		forceRecalculateEdges: () => void,
 		/** Calls moveEnd with apply: false. This can technically be called from "end", it should still work. */
 		cancel: (e: PointerEvent | KeyboardEvent | undefined, state: MoveState) => void,
-		/** Saves result to resolve moveStart promise with then calls moveEnd with given apply. Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
+		/** Saves result to resolve moveStart promise, updates edges if you passed updateEdges then aborts the handler (only onMoveEnded will fire after) . Not available during "end" event. It's designed for resolving from other external evente (e.g. key events). */
 		resolve: T extends "end" ? undefined : ((opts: ActionResolve) => void)
 	): MoveChangeResult
 	/**