@mrts/soltw 0.3.28 → 0.3.30

package/dist/index.d.ts

@@ -95,6 +95,7 @@ declare const Item: Component<TItemProps>;
 //#region src/Block.d.ts
 type TProps$2 = ParentProps & {
   vtags?: TagListArgument;
+  stags?: TagListArgument;
   styler?: ISVTStyler;
   class?: string;
   element?: string;
@@ -104,6 +105,7 @@ declare const Block: Component<TProps$2>;
 //#region src/items/ItemGroup.d.ts
 type TProps$1 = {
   items: IdLabelArg[];
+  vertical?: boolean;
   callback?: (item: IdLabel) => void;
   class?: string | {
     group?: string;
@@ -116,6 +118,7 @@ type TProps$1 = {
     group?: TagListArgument;
     item?: TagListArgument;
   };
+  styler?: ISVTStyler;
 };
 declare const ItemGroup: Component<TProps$1>;
 //#endregion

package/dist/index.js

@@ -100,13 +100,6 @@ function createRenderEffect(fn, value, options) {
 	if (Scheduler && Transition && Transition.running) Updates.push(c);
 	else updateComputation(c);
 }
-function createEffect(fn, value, options) {
-	runEffects = runUserEffects;
-	const c = createComputation(fn, value, false, STALE), s = SuspenseContext && useContext(SuspenseContext);
-	if (s) c.suspense = s;
-	if (!options || !options.render) c.user = true;
-	Effects ? Effects.push(c) : updateComputation(c);
-}
 function createMemo(fn, value, options) {
 	options = options ? Object.assign({}, signalOptions, options) : signalOptions;
 	const c = createComputation(fn, value, true, 0);
@@ -165,10 +158,6 @@ function startTransition(fn) {
 	});
 }
 const [transPending, setTransPending] = /* @__PURE__ */ createSignal(false);
-function useContext(context) {
-	let value;
-	return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
-}
 let SuspenseContext;
 function readSignal() {
 	const runningTransition = Transition && Transition.running;
@@ -418,28 +407,6 @@ function scheduleQueue(queue) {
 		}
 	}
 }
-function runUserEffects(queue) {
-	let i, userLength = 0;
-	for (i = 0; i < queue.length; i++) {
-		const e = queue[i];
-		if (!e.user) runTop(e);
-		else queue[userLength++] = e;
-	}
-	if (sharedConfig.context) {
-		if (sharedConfig.count) {
-			sharedConfig.effects || (sharedConfig.effects = []);
-			sharedConfig.effects.push(...queue.slice(0, userLength));
-			return;
-		}
-		setHydrateContext();
-	}
-	if (sharedConfig.effects && (sharedConfig.done || !sharedConfig.count)) {
-		queue = [...sharedConfig.effects, ...queue];
-		userLength += sharedConfig.effects.length;
-		delete sharedConfig.effects;
-	}
-	for (i = 0; i < userLength; i++) runTop(queue[i]);
-}
 function lookUpstream(node, ignore) {
 	const runningTransition = Transition && Transition.running;
 	if (runningTransition) node.tState = 0;
@@ -3119,9 +3086,7 @@ var Stylers = class {
 var _tmpl$$2 = /* @__PURE__ */ template(`<div>`);
 const Item = (props) => {
 	const itemData = () => {
-		const r = buildIdLabel(props.idLabel);
-		if (props.selected) r.label = `[${r.label}]`;
-		return r;
+		return buildIdLabel(props.idLabel);
 	};
 	const currentSTags = () => {
 		const r = [];
@@ -3130,16 +3095,13 @@ const Item = (props) => {
 		if (props.disabled) r.push("item:disabled");
 		return r;
 	};
-	const currentStyler = () => {
-		if (props.styler) return props.styler;
-		else return Stylers.base;
-	};
+	const currentStyler = () => props.styler ?? Stylers.base;
 	const classProp = createMemo(() => {
 		if (props.class == void 0) return {};
 		else if (typeof props.class == "string") return { item: props.class };
 		else return props.class;
 	});
-	const itemClasses = () => {
+	const itemClasses = createMemo(() => {
 		const stags = currentSTags();
 		const styler = currentStyler();
 		const rawClasses = [];
@@ -3152,7 +3114,7 @@ const Item = (props) => {
 		if (props.disabled && customClasses.disabled) rawClasses.push(customClasses.disabled);
 		rawClasses.push("relative");
 		return twMerge(rawClasses);
-	};
+	});
 	const disablerClasses = createMemo(() => {
 		const rawClasses = [];
 		if (currentStyler()) rawClasses.push(...currentStyler().classes("item/disabler", props.vtags));
@@ -3164,6 +3126,7 @@ const Item = (props) => {
 		if (props.callback != void 0) {
 			props.callback(itemData());
 			e.stopPropagation();
+			e.preventDefault();
 		}
 	}
 	return (() => {
@@ -3198,9 +3161,10 @@ const Block = (props) => {
 		else return Stylers.base;
 	};
 	function blockClasses() {
-		const classes = currentStyler().classes("block", props.vtags) ?? [];
+		const stags = props.stags ?? "block";
+		const classes = currentStyler().classes(stags, props.vtags) ?? [];
 		if (props.class) classes.push(props.class);
-		return twMerge(classes);
+		return "_block " + twMerge(classes);
 	}
 	return (() => {
 		var _el$ = _tmpl$$1();
@@ -3214,9 +3178,6 @@ const Block = (props) => {
 //#region src/items/ItemGroup.tsx
 const ItemGroup = (props) => {
 	const items = () => props.items.map(buildIdLabel);
-	createEffect(() => {
-		console.log("GROUP ITEMS", items());
-	});
 	const currentVTags = createMemo(() => {
 		const item = [];
 		const group = [];
@@ -3246,7 +3207,7 @@ const ItemGroup = (props) => {
 		};
 	});
 	const blockClasses = () => {
-		return twMerge("flex flex-row gap-1", classes().group);
+		return twMerge("flex flex-row gap-1", props.vertical ? "flex-col" : "flex-row", classes().group);
 	};
 	const itemClasses = () => {
 		return classes().item;
@@ -3266,6 +3227,10 @@ const ItemGroup = (props) => {
 		get vtags() {
 			return currentVTags().group;
 		},
+		stags: "item-group",
+		get styler() {
+			return props.styler;
+		},
 		get children() {
 			return createComponent(For, {
 				get each() {
@@ -3284,6 +3249,9 @@ const ItemGroup = (props) => {
 						},
 						get vtags() {
 							return currentVTags().item;
+						},
+						get styler() {
+							return props.styler;
 						}
 					});
 				}

package/dist/index.jsx

@@ -17,25 +17,6 @@ function buildIdLabel(arg) {
 
 //#endregion
 //#region ../../node_modules/solid-js/dist/solid.js
-const sharedConfig = {
-	context: void 0,
-	registry: void 0,
-	effects: void 0,
-	done: false,
-	getContextId() {
-		return getContextId(this.context.count);
-	},
-	getNextContextId() {
-		return getContextId(this.context.count++);
-	}
-};
-function getContextId(count) {
-	const num = String(count), len = num.length - 1;
-	return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
-}
-function setHydrateContext(context) {
-	sharedConfig.context = context;
-}
 const equalFn = (a, b) => a === b;
 const $TRACK = Symbol("solid-track");
 const signalOptions = { equals: equalFn };
@@ -88,13 +69,6 @@ function createSignal(value, options) {
 	};
 	return [readSignal.bind(s), setter];
 }
-function createEffect(fn, value, options) {
-	runEffects = runUserEffects;
-	const c = createComputation(fn, value, false, STALE), s = SuspenseContext && useContext(SuspenseContext);
-	if (s) c.suspense = s;
-	if (!options || !options.render) c.user = true;
-	Effects ? Effects.push(c) : updateComputation(c);
-}
 function createMemo(fn, value, options) {
 	options = options ? Object.assign({}, signalOptions, options) : signalOptions;
 	const c = createComputation(fn, value, true, 0);
@@ -153,10 +127,6 @@ function startTransition(fn) {
 	});
 }
 const [transPending, setTransPending] = /* @__PURE__ */ createSignal(false);
-function useContext(context) {
-	let value;
-	return Owner && Owner.context && (value = Owner.context[context.id]) !== void 0 ? value : context.defaultValue;
-}
 let SuspenseContext;
 function readSignal() {
 	const runningTransition = Transition && Transition.running;
@@ -406,28 +376,6 @@ function scheduleQueue(queue) {
 		}
 	}
 }
-function runUserEffects(queue) {
-	let i, userLength = 0;
-	for (i = 0; i < queue.length; i++) {
-		const e = queue[i];
-		if (!e.user) runTop(e);
-		else queue[userLength++] = e;
-	}
-	if (sharedConfig.context) {
-		if (sharedConfig.count) {
-			sharedConfig.effects || (sharedConfig.effects = []);
-			sharedConfig.effects.push(...queue.slice(0, userLength));
-			return;
-		}
-		setHydrateContext();
-	}
-	if (sharedConfig.effects && (sharedConfig.done || !sharedConfig.count)) {
-		queue = [...sharedConfig.effects, ...queue];
-		userLength += sharedConfig.effects.length;
-		delete sharedConfig.effects;
-	}
-	for (i = 0; i < userLength; i++) runTop(queue[i]);
-}
 function lookUpstream(node, ignore) {
 	const runningTransition = Transition && Transition.running;
 	if (runningTransition) node.tState = 0;
@@ -2755,9 +2703,7 @@ var Stylers = class {
 //#region src/items/Item.tsx
 const Item = (props) => {
 	const itemData = () => {
-		const r = buildIdLabel(props.idLabel);
-		if (props.selected) r.label = `[${r.label}]`;
-		return r;
+		return buildIdLabel(props.idLabel);
 	};
 	const currentSTags = () => {
 		const r = [];
@@ -2766,16 +2712,13 @@ const Item = (props) => {
 		if (props.disabled) r.push("item:disabled");
 		return r;
 	};
-	const currentStyler = () => {
-		if (props.styler) return props.styler;
-		else return Stylers.base;
-	};
+	const currentStyler = () => props.styler ?? Stylers.base;
 	const classProp = createMemo(() => {
 		if (props.class == void 0) return {};
 		else if (typeof props.class == "string") return { item: props.class };
 		else return props.class;
 	});
-	const itemClasses = () => {
+	const itemClasses = createMemo(() => {
 		const stags = currentSTags();
 		const styler = currentStyler();
 		const rawClasses = [];
@@ -2788,7 +2731,7 @@ const Item = (props) => {
 		if (props.disabled && customClasses.disabled) rawClasses.push(customClasses.disabled);
 		rawClasses.push("relative");
 		return twMerge(rawClasses);
-	};
+	});
 	const disablerClasses = createMemo(() => {
 		const rawClasses = [];
 		if (currentStyler()) rawClasses.push(...currentStyler().classes("item/disabler", props.vtags));
@@ -2800,6 +2743,7 @@ const Item = (props) => {
 		if (props.callback != void 0) {
 			props.callback(itemData());
 			e.stopPropagation();
+			e.preventDefault();
 		}
 	}
 	return <div onClick={(e) => handleClick(e)} class={itemClasses()}>
@@ -2820,22 +2764,18 @@ const Block = (props) => {
 		else return Stylers.base;
 	};
 	function blockClasses() {
-		const classes = currentStyler().classes("block", props.vtags) ?? [];
+		const stags = props.stags ?? "block";
+		const classes = currentStyler().classes(stags, props.vtags) ?? [];
 		if (props.class) classes.push(props.class);
-		return twMerge(classes);
+		return "_block " + twMerge(classes);
 	}
-	return <div class={blockClasses()}>
-      {props.children}
-    </div>;
+	return <div class={blockClasses()}>{props.children}</div>;
 };
 
 //#endregion
 //#region src/items/ItemGroup.tsx
 const ItemGroup = (props) => {
 	const items = () => props.items.map(buildIdLabel);
-	createEffect(() => {
-		console.log("GROUP ITEMS", items());
-	});
 	const currentVTags = createMemo(() => {
 		const item = [];
 		const group = [];
@@ -2865,7 +2805,7 @@ const ItemGroup = (props) => {
 		};
 	});
 	const blockClasses = () => {
-		return twMerge("flex flex-row gap-1", classes().group);
+		return twMerge("flex flex-row gap-1", props.vertical ? "flex-col" : "flex-row", classes().group);
 	};
 	const itemClasses = () => {
 		return classes().item;
@@ -2878,11 +2818,11 @@ const ItemGroup = (props) => {
 		else if (typeof props.selection == "object") return !!props.selection[id];
 		return false;
 	};
-	return <Block class={blockClasses()} vtags={currentVTags().group}>
+	return <Block class={blockClasses()} vtags={currentVTags().group} stags="item-group" styler={props.styler}>
       <For each={items()}>
         {(item) => {
 		const selected = () => itemSelected(item.id);
-		return <Item idLabel={item} selected={selected()} callback={() => callCallback(item)} class={itemClasses()} vtags={currentVTags().item}></Item>;
+		return <Item idLabel={item} selected={selected()} callback={() => callCallback(item)} class={itemClasses()} vtags={currentVTags().item} styler={props.styler}></Item>;
 	}}
       </For>
     </Block>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mrts/soltw",
   "description": "S O L T W : SolidJS + tailwindcss ui components",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d043ab871db973f4419c81b4ef9feea8ec17f57b"
+  "gitHead": "56805e2a1ac643ee83064ec4ed91c8d3e85353d0"
 }