@witchcraft/layout 0.5.11 → 0.5.13

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@witchcraft/layout",
   "configKey": "witchcraftLayout",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

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

@@ -1844,12 +1844,14 @@ export type LayoutChange<TInfo = never> = {
     window?: Partial<LayoutWindow>;
     info?: TInfo;
 };
-export type ExtendedMoveTypes = Flatten<OrToAnd<keyof Register extends `LayoutMove${infer T}` ? Register extends Record<`LayoutMove${T}`, infer U> ? U extends {
-    type: string;
-    context: any;
-    resolve: any;
-    moveType: "edge" | "frame" | "other";
-} ? Record<U["type"], U> : never : never : never>>;
+export type ExtendedMoveTypes = Flatten<OrToAnd<{
+    [K in keyof Register]: K extends `LayoutMove${string}` ? Register[K] extends {
+        type: string;
+        context: any;
+        resolve: any;
+        moveType: "edge" | "frame" | "other";
+    } ? Record<Register[K]["type"], Register[K]> : never : never;
+}[keyof Register]>>;
 export type MoveState = {
     /** The current directions in the corresponding orientations that the user is dragging in. */
     moveDirections: Record<Orientation, Direction | undefined>;

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

@@ -9,18 +9,22 @@ export type LayoutContext = ComputedRef<{
 export declare const layoutContextInjectionKey: InjectionKey<LayoutContext>;
 export interface UseFramesContext {
     actionHandler: IActionHandler;
-    moveStart<T extends "edge" | "frame" | "other", TContextType extends keyof ExtendedMoveTypes, TContext extends ExtendedMoveTypes[TContextType], TContextReturn extends TContext extends {
+    moveStart<T extends "edge" | "frame" | "other", TContextType extends keyof ExtendedMoveTypes = keyof ExtendedMoveTypes, TContext extends ExtendedMoveTypes[TContextType] = ExtendedMoveTypes[TContextType], TContextReturn extends TContext extends {
+        resolve: infer R;
+    } ? R : never = TContext extends {
         resolve: infer R;
     } ? R : never, TContextMoveType extends TContext extends {
         moveType: infer M;
+    } ? M : never = TContext extends {
+        moveType: infer M;
     } ? M : never, TContextContext extends TContext extends {
         context: infer C;
-    } ? C : never, TType extends [TContextMoveType] extends [never] ? T : TContextMoveType>(e: PointerEvent | undefined, type: TType, data: T extends "edge" ? EdgeMoveStartData : T extends "frame" ? FrameMoveStartData : undefined, opts?: {
+    } ? C : never = TContext extends {
+        context: infer C;
+    } ? C : never, TType extends [TContextMoveType] extends [never] ? T : TContextMoveType = [TContextMoveType] extends [never] ? T : TContextMoveType>(e: PointerEvent | undefined, type: TType, data: T extends "edge" ? EdgeMoveStartData : T extends "frame" ? FrameMoveStartData : undefined, opts?: {
         moveEvent?: string;
         endEvent?: string;
-        context?: {
-            type: TContextType;
-        } & TContextContext;
+        context?: TContextContext;
     }): TContext extends never ? Promise<void> : Promise<TContextReturn>;
     onMove: (e: PointerEvent) => void;
     moveEnd: (e?: PointerEvent, options?: {

package/package.json

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

package/src/runtime/types/index.ts

@@ -445,18 +445,21 @@ export type LayoutChange<TInfo = never> = {
 
 
 // #todo we also need to change how the normal types are extended to this pattern
-export type ExtendedMoveTypes = Flatten<OrToAnd<keyof Register extends `LayoutMove${infer T}`
-	? Register extends Record<`LayoutMove${T}`, infer U>
-		? U extends {
-			type: string
-			context: any
-			resolve: any
-			moveType: "edge" | "frame" | "other"
-		}
-			? Record<U["type"], U>
+export type ExtendedMoveTypes = Flatten<OrToAnd<
+	{
+		[K in keyof Register]: K extends `LayoutMove${string}`
+			? Register[K] extends {
+				type: string
+				context: any
+				resolve: any
+				moveType: "edge" | "frame" | "other"
+			}
+				? Record<Register[K]["type"], Register[K]>
+				: never
 			: never
-		: never
-	: never>>
+	}[keyof Register]
+>>
+
 
 export type MoveState = {
 	/** The current directions in the corresponding orientations that the user is dragging in. */

package/src/runtime/types/vue.ts

@@ -18,13 +18,13 @@ export interface UseFramesContext {
 	actionHandler: IActionHandler
 	moveStart<
 		T extends "edge" | "frame" | "other",
-		TContextType extends keyof ExtendedMoveTypes,
-		TContext extends ExtendedMoveTypes[TContextType],
-		TContextReturn extends TContext extends { resolve: infer R } ? R : never,
-		TContextMoveType extends TContext extends { moveType: infer M } ? M : never,
-		TContextContext extends TContext extends { context: infer C } ? C : never,
+		TContextType extends keyof ExtendedMoveTypes = keyof ExtendedMoveTypes,
+		TContext extends ExtendedMoveTypes[TContextType] = ExtendedMoveTypes[TContextType],
+		TContextReturn extends TContext extends { resolve: infer R } ? R : never = TContext extends { resolve: infer R } ? R : never,
+		TContextMoveType extends TContext extends { moveType: infer M } ? M : never = TContext extends { moveType: infer M } ? M : never,
+		TContextContext extends TContext extends { context: infer C } ? C : never = TContext extends { context: infer C } ? C : never,
 		// cursed https://github.com/microsoft/TypeScript/issues/23182
-		TType extends [TContextMoveType] extends [never] ? T : TContextMoveType
+		TType extends [TContextMoveType] extends [never] ? T : TContextMoveType = [TContextMoveType] extends [never] ? T : TContextMoveType
 	>(
 		e: PointerEvent | undefined,
 		type: TType,
@@ -33,7 +33,7 @@ export interface UseFramesContext {
 		opts?: {
 			moveEvent?: string
 			endEvent?: string
-			context?: { type: TContextType } & TContextContext
+			context?: TContextContext
 		}
 	): TContext extends never
 		? Promise<void>