@shwfed/config 3.0.1 → 3.0.3

package/dist/runtime/components/table/schema.d.ts

@@ -158,6 +158,40 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             readonly message: string;
         }[]] | undefined;
     }[];
+    readonly query?: {
+        readonly style?: string | undefined;
+        readonly id?: string | undefined;
+        readonly initial?: {
+            readonly data: string;
+            readonly request?: string | undefined;
+        } | undefined;
+        readonly displayName?: string | undefined;
+        readonly kind: "shwfed.component.form";
+        readonly fields: readonly any[];
+        readonly layouts: readonly {
+            readonly name: string;
+            readonly layout: {
+                readonly style?: string | undefined;
+                readonly columns: number;
+                readonly gap?: number | undefined;
+                readonly rows?: number | undefined;
+                readonly placements: {
+                    readonly [x: string]: {
+                        readonly area: readonly [readonly [number, number], readonly [number, number]];
+                        readonly v?: "stretch" | "center" | "end" | "start" | undefined;
+                        readonly h?: "stretch" | "center" | "end" | "start" | undefined;
+                    };
+                };
+            };
+            readonly media?: string | undefined;
+        }[];
+        readonly readonly?: string | undefined;
+    } | undefined;
+    readonly dataSource?: {
+        readonly data: string;
+        readonly total?: string | undefined;
+        readonly request?: string | undefined;
+    } | undefined;
     readonly actions?: {
         readonly size: "default" | "sm" | "xs";
         readonly style?: string | undefined;
@@ -225,40 +259,6 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
         }[];
     } | undefined;
-    readonly query?: {
-        readonly style?: string | undefined;
-        readonly id?: string | undefined;
-        readonly initial?: {
-            readonly data: string;
-            readonly request?: string | undefined;
-        } | undefined;
-        readonly displayName?: string | undefined;
-        readonly kind: "shwfed.component.form";
-        readonly fields: readonly any[];
-        readonly layouts: readonly {
-            readonly name: string;
-            readonly layout: {
-                readonly style?: string | undefined;
-                readonly columns: number;
-                readonly gap?: number | undefined;
-                readonly rows?: number | undefined;
-                readonly placements: {
-                    readonly [x: string]: {
-                        readonly area: readonly [readonly [number, number], readonly [number, number]];
-                        readonly v?: "stretch" | "center" | "end" | "start" | undefined;
-                        readonly h?: "stretch" | "center" | "end" | "start" | undefined;
-                    };
-                };
-            };
-            readonly media?: string | undefined;
-        }[];
-        readonly readonly?: string | undefined;
-    } | undefined;
-    readonly dataSource?: {
-        readonly data: string;
-        readonly total?: string | undefined;
-        readonly request?: string | undefined;
-    } | undefined;
     readonly bottomActions?: {
         readonly size: "default" | "sm" | "xs";
         readonly style?: string | undefined;
@@ -827,6 +827,40 @@ export declare function createTableConfig(body: Omit<Schema.Schema.Type<ReturnTy
             readonly message: string;
         }[]] | undefined;
     }[];
+    query?: {
+        readonly style?: string | undefined;
+        readonly id?: string | undefined;
+        readonly initial?: {
+            readonly data: string;
+            readonly request?: string | undefined;
+        } | undefined;
+        readonly displayName?: string | undefined;
+        readonly kind: "shwfed.component.form";
+        readonly fields: readonly any[];
+        readonly layouts: readonly {
+            readonly name: string;
+            readonly layout: {
+                readonly style?: string | undefined;
+                readonly columns: number;
+                readonly gap?: number | undefined;
+                readonly rows?: number | undefined;
+                readonly placements: {
+                    readonly [x: string]: {
+                        readonly area: readonly [readonly [number, number], readonly [number, number]];
+                        readonly v?: "stretch" | "center" | "end" | "start" | undefined;
+                        readonly h?: "stretch" | "center" | "end" | "start" | undefined;
+                    };
+                };
+            };
+            readonly media?: string | undefined;
+        }[];
+        readonly readonly?: string | undefined;
+    } | undefined;
+    dataSource?: {
+        readonly data: string;
+        readonly total?: string | undefined;
+        readonly request?: string | undefined;
+    } | undefined;
     actions?: {
         readonly size: "default" | "sm" | "xs";
         readonly style?: string | undefined;
@@ -894,40 +928,6 @@ export declare function createTableConfig(body: Omit<Schema.Schema.Type<ReturnTy
             readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
         }[];
     } | undefined;
-    query?: {
-        readonly style?: string | undefined;
-        readonly id?: string | undefined;
-        readonly initial?: {
-            readonly data: string;
-            readonly request?: string | undefined;
-        } | undefined;
-        readonly displayName?: string | undefined;
-        readonly kind: "shwfed.component.form";
-        readonly fields: readonly any[];
-        readonly layouts: readonly {
-            readonly name: string;
-            readonly layout: {
-                readonly style?: string | undefined;
-                readonly columns: number;
-                readonly gap?: number | undefined;
-                readonly rows?: number | undefined;
-                readonly placements: {
-                    readonly [x: string]: {
-                        readonly area: readonly [readonly [number, number], readonly [number, number]];
-                        readonly v?: "stretch" | "center" | "end" | "start" | undefined;
-                        readonly h?: "stretch" | "center" | "end" | "start" | undefined;
-                    };
-                };
-            };
-            readonly media?: string | undefined;
-        }[];
-        readonly readonly?: string | undefined;
-    } | undefined;
-    dataSource?: {
-        readonly data: string;
-        readonly total?: string | undefined;
-        readonly request?: string | undefined;
-    } | undefined;
     bottomActions?: {
         readonly size: "default" | "sm" | "xs";
         readonly style?: string | undefined;

package/dist/runtime/components/ui/command/CommandList.d.vue.ts

@@ -3,9 +3,9 @@ import type { HTMLAttributes } from 'vue';
 type __VLS_Props = ListboxContentProps & {
     class?: HTMLAttributes['class'];
 };
-declare var __VLS_8: {};
+declare var __VLS_14: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_8) => any;
+    default?: (props: typeof __VLS_14) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/components/ui/command/CommandList.vue

@@ -2,6 +2,7 @@
 import { reactiveOmit } from "@vueuse/core";
 import { ListboxContent, useForwardProps } from "reka-ui";
 import { cn } from "../../../utils/cn";
+import { ScrollArea } from "../scroll-area";
 const props = defineProps({
   asChild: { type: Boolean, required: false },
   as: { type: null, required: false },
@@ -12,13 +13,20 @@ const forwarded = useForwardProps(delegatedProps);
 </script>
 
 <template>
+  <!-- The cap stays on ListboxContent so callers keep overriding it through
+       `class`; ScrollArea inherits it and owns the actual overflow. -->
   <ListboxContent
     data-slot="command-list"
     v-bind="forwarded"
-    :class="cn('max-h-[300px] scroll-py-1 overflow-x-hidden overflow-y-auto', props.class)"
+    :class="cn('max-h-[300px] overflow-hidden', props.class)"
   >
-    <div role="presentation">
-      <slot />
-    </div>
+    <ScrollArea
+      class="max-h-[inherit]"
+      viewport-class="scroll-py-1"
+    >
+      <div role="presentation">
+        <slot />
+      </div>
+    </ScrollArea>
   </ListboxContent>
 </template>

package/dist/runtime/components/ui/command/CommandList.vue.d.ts

@@ -3,9 +3,9 @@ import type { HTMLAttributes } from 'vue';
 type __VLS_Props = ListboxContentProps & {
     class?: HTMLAttributes['class'];
 };
-declare var __VLS_8: {};
+declare var __VLS_14: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_8) => any;
+    default?: (props: typeof __VLS_14) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/components/ui/date-picker/DatePickerInput.d.vue.ts

@@ -28,8 +28,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {},
     "onUpdate:modelValue"?: ((args_0: Date | undefined) => any) | undefined;
 }>, {
     size: "sm" | "md" | "lg";
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/components/ui/date-picker/DatePickerInput.vue.d.ts

@@ -28,8 +28,8 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {},
     "onUpdate:modelValue"?: ((args_0: Date | undefined) => any) | undefined;
 }>, {
     size: "sm" | "md" | "lg";
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/components/ui/date-picker/DatePickerTimeInput.d.vue.ts

@@ -22,8 +22,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     size: "sm" | "md" | "lg";
     granularity: "hour" | "minute" | "second";
     hourCycle: 12 | 24;
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ui/date-picker/DatePickerTimeInput.vue.d.ts

@@ -22,8 +22,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     size: "sm" | "md" | "lg";
     granularity: "hour" | "minute" | "second";
     hourCycle: 12 | 24;
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ui/date-range-picker/DateRangePickerInput.d.vue.ts

@@ -29,8 +29,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     "onUpdate:endValue"?: ((args_0: Date | undefined) => any) | undefined;
 }>, {
     size: "sm" | "md" | "lg";
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ui/date-range-picker/DateRangePickerInput.vue.d.ts

@@ -29,8 +29,8 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     "onUpdate:endValue"?: ((args_0: Date | undefined) => any) | undefined;
 }>, {
     size: "sm" | "md" | "lg";
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ui/date-range-picker/DateRangePickerTimeInput.d.vue.ts

@@ -26,9 +26,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     size: "sm" | "md" | "lg";
     granularity: "hour" | "minute" | "second";
     hourCycle: 12 | 24;
-    rangeSeparatorIcon: string;
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
+    rangeSeparatorIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ui/date-range-picker/DateRangePickerTimeInput.vue.d.ts

@@ -26,9 +26,9 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {
     size: "sm" | "md" | "lg";
     granularity: "hour" | "minute" | "second";
     hourCycle: 12 | 24;
-    rangeSeparatorIcon: string;
-    clearIcon: string;
     clearable: boolean;
+    clearIcon: string;
+    rangeSeparatorIcon: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ui/expression-editor/ExpressionEditor.vue

@@ -170,7 +170,7 @@ const leadingAlign = computed(
           >
             <Command class="rounded group-data-[side=top]/popover:flex-col-reverse">
               <CommandInput placeholder="搜索可用变量" />
-              <CommandList class="max-h-48 overflow-y-auto">
+              <CommandList class="max-h-48">
                 <CommandEmpty>No variables.</CommandEmpty>
                 <CommandGroup>
                   <CommandItem

package/dist/runtime/components/ui/input-group/InputGroupCombobox.d.vue.ts

@@ -3,9 +3,9 @@ type __VLS_Props = PopoverContentProps & {
     disabled?: boolean;
     invalid?: boolean;
 };
-declare var __VLS_52: {};
+declare var __VLS_54: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_52) => any;
+    default?: (props: typeof __VLS_54) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     blur: (...args: any[]) => void;

package/dist/runtime/components/ui/input-group/InputGroupCombobox.vue

@@ -64,12 +64,18 @@ const open = ref(false);
           @blur="emits('blur', $event)"
         />
       </PopoverTrigger>
+      <!-- The search input is the trigger, so it sits outside the content. On
+           open reka's FocusScope focuses the first tabbable node inside the
+           content — `CommandList`'s ScrollArea viewport carries `tabindex=0` —
+           which blurs the input and makes the combobox untypeable. Keep focus
+           where the user put it. -->
       <PopoverContent
         v-bind="forwarded"
         :reference="getInputGroupReference().value ?? void 0"
         :style="{
   width: 'var(--reka-popover-trigger-width)'
 }"
+        @open-auto-focus="(event) => event.preventDefault()"
       >
         <CommandList>
           <CommandEmpty as-child>

package/dist/runtime/components/ui/input-group/InputGroupCombobox.vue.d.ts

@@ -3,9 +3,9 @@ type __VLS_Props = PopoverContentProps & {
     disabled?: boolean;
     invalid?: boolean;
 };
-declare var __VLS_52: {};
+declare var __VLS_54: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_52) => any;
+    default?: (props: typeof __VLS_54) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     blur: (...args: any[]) => void;

package/dist/runtime/components/ui/scroll-area/ScrollArea.d.vue.ts

@@ -2,6 +2,7 @@ import type { ScrollAreaRootProps } from 'reka-ui';
 import type { HTMLAttributes } from 'vue';
 type __VLS_Props = ScrollAreaRootProps & {
     class?: HTMLAttributes['class'];
+    viewportClass?: HTMLAttributes['class'];
 };
 declare var __VLS_14: {};
 type __VLS_Slots = {} & {

package/dist/runtime/components/ui/scroll-area/ScrollArea.vue

@@ -14,9 +14,10 @@ const props = defineProps({
   scrollHideDelay: { type: Number, required: false },
   asChild: { type: Boolean, required: false },
   as: { type: null, required: false },
-  class: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true }
+  class: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
+  viewportClass: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true }
 });
-const delegatedProps = reactiveOmit(props, "class");
+const delegatedProps = reactiveOmit(props, "class", "viewportClass");
 </script>
 
 <template>
@@ -25,9 +26,14 @@ const delegatedProps = reactiveOmit(props, "class");
     v-bind="delegatedProps"
     :class="cn('relative', props.class)"
   >
+    <!-- `max-h-[inherit]`: when the root is capped by `max-h-*` instead of a
+         definite height (a popover list sized by its content), `h-full` on the
+         viewport resolves to `auto` and it would grow past the cap unscrolled.
+         Inheriting the root's max-height gives the viewport the overflow it
+         needs; it computes to `none` for definite-height roots. -->
     <ScrollAreaViewport
       data-slot="scroll-area-viewport"
-      class="size-full rounded-[inherit] outline-none"
+      :class="cn('size-full max-h-[inherit] rounded-[inherit] outline-none', props.viewportClass)"
     >
       <slot />
     </ScrollAreaViewport>

package/dist/runtime/components/ui/scroll-area/ScrollArea.vue.d.ts

@@ -2,6 +2,7 @@ import type { ScrollAreaRootProps } from 'reka-ui';
 import type { HTMLAttributes } from 'vue';
 type __VLS_Props = ScrollAreaRootProps & {
     class?: HTMLAttributes['class'];
+    viewportClass?: HTMLAttributes['class'];
 };
 declare var __VLS_14: {};
 type __VLS_Slots = {} & {

package/dist/runtime/share/event-bus.d.ts

@@ -160,8 +160,16 @@ export declare function useEventChannel(): EventChannel | undefined;
  * scope (e.g. a table row's `row`) rather than the handling ancestor's. Pass it
  * whenever the emitter has a CEL context; omit it and ops fall back to their
  * host evaluator. See `OpRequest.cel`.
+ *
+ * `outputs` lets the CALLER own the chain's step-outputs map instead of getting
+ * a fresh private one. Two things need that, both in `state.write`: the button
+ * reads what its 写入前 chain published to thread into the write expressions'
+ * `steps`, and it passes the SAME map to its 写入后 chain, so an after-op can
+ * reference a before-op's output. A caller that supplies one MUST mint it per
+ * RUN (inside its own `Effect.suspend`) — otherwise one click's outputs leak
+ * into the next, which is exactly what the private map prevents.
  */
-export declare function dispatchTriggers(channel: EventChannel | undefined, triggers: ReadonlyArray<TriggerValue> | undefined, cel?: CelEvaluator): Effect.Effect<void>;
+export declare function dispatchTriggers(channel: EventChannel | undefined, triggers: ReadonlyArray<TriggerValue> | undefined, cel?: CelEvaluator, outputs?: Record<string, unknown>): Effect.Effect<void>;
 /**
  * One operation a component type exposes. `id` is what the trigger stores;
  * `name`/`icon` are display only.

package/dist/runtime/share/event-bus.js

@@ -53,10 +53,10 @@ export function provideEventTarget(instanceId, operations) {
 export function useEventChannel() {
   return inject(EVENT_CHANNEL_KEY, void 0);
 }
-export function dispatchTriggers(channel, triggers, cel) {
+export function dispatchTriggers(channel, triggers, cel, outputs) {
   if (!channel || !triggers || triggers.length === 0) return Effect.void;
   return Effect.suspend(() => {
-    const outputs = {};
+    const chainOutputs = outputs ?? {};
     return Effect.forEach(
       triggers,
       (trigger) => channel.dispatch({
@@ -65,9 +65,9 @@ export function dispatchTriggers(channel, triggers, cel) {
         params: trigger.params,
         cel,
         step: {
-          outputs: () => outputs,
+          outputs: () => chainOutputs,
           publish: (output) => {
-            if (trigger.id) outputs[trigger.id] = output;
+            if (trigger.id) chainOutputs[trigger.id] = output;
           }
         }
       }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/config",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Configurable UI for SHWFED",
   "type": "module",
   "publishConfig": {