@radio-garden/ditojs-admin 2.91.0-0.1b51d4b4e → 2.91.0-2.566eca6ca

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radio-garden/ditojs-admin",
-  "version": "2.91.0-0.1b51d4b4e",
+  "version": "2.91.0-2.566eca6ca",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/main/packages/admin",
@@ -34,8 +34,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "npm:@radio-garden/ditojs-ui@^2.91.0-0.1b51d4b4e",
-    "@ditojs/utils": "npm:@radio-garden/ditojs-utils@^2.91.0-0.1b51d4b4e"
+    "@ditojs/ui": "npm:@radio-garden/ditojs-ui@^2.91.0-2.566eca6ca",
+    "@ditojs/utils": "npm:@radio-garden/ditojs-utils@^2.91.0-2.566eca6ca"
   },
   "peerDependencies": {
     "@kyvg/vue3-notification": "^3.4.2",
@@ -85,9 +85,9 @@
   "devDependencies": {
     "typescript": "^5.9.3",
     "vite": "^7.3.1",
-    "@ditojs/build": "npm:@radio-garden/ditojs-build@^2.91.0-0.1b51d4b4e"
+    "@ditojs/build": "npm:@radio-garden/ditojs-build@^2.91.0-2.566eca6ca"
   },
-  "gitHead": "1b51d4b4e",
+  "gitHead": "566eca6ca",
   "gitBranch": "feature/asset-signatures",
   "scripts": {
     "build": "vite build",

package/types/index.d.ts

@@ -2970,6 +2970,30 @@ export type SourceComponent<$Item = any> =
   | TreeListSchema<$Item>
   | TreeObjectSchema<$Item>
 
+/**
+ * Field components that don't have an options mixin (excludes
+ * select, multiselect, and source components like list/object/tree).
+ */
+type NonOptionFieldComponent<$Item = any> = Exclude<
+  NonSectionComponent<$Item>,
+  SelectSchema<$Item> | MultiselectSchema<$Item> | SourceComponent<$Item>
+>
+
+/**
+ * Select/multiselect with a typed `$Option` for option callbacks.
+ *
+ * Note: This is intentionally an intersection type rather than
+ * `SelectSchema<$Item, $Option> | MultiselectSchema<$Item, $Option>`,
+ * because using the full interfaces in a union breaks TypeScript's
+ * contextual typing for callbacks in the `Components` mapped type.
+ */
+type OptionComponent<$Item, $Option> =
+  BaseSchema<$Item>
+  & SchemaOptionsMixin<$Item, $Option>
+  & SchemaAffixMixin<$Item>
+  & Pick<MultiselectSchema, 'multiple' | 'searchable' | 'stayOpen' | 'taggable'>
+  & { type: 'select' | 'multiselect' }
+
 /**
  * Strips properties with `never` values from a type.
  */
@@ -3055,7 +3079,9 @@ export type Components<$Item = any> = 0 extends 1 & $Item
             : NonSectionComponent<$Item>
           : NonNullable<$Item[K]> extends Record<string, any>
             ?
-                | NonSectionComponent<NonNullable<$Item[K]>>
+                | NonOptionFieldComponent<$Item>
+                | OptionComponent<$Item, NonNullable<$Item[K]>>
+                | SourceComponent<NonNullable<$Item[K]>>
                 | SectionSchema<$Item, NonNullable<$Item[K]>>
             :
                 | NonSectionComponent<$Item>