From 5dd7164ea797fe99e8a41e2a2a49fb1532a23282 Mon Sep 17 00:00:00 2001 From: Reguel Wermelinger Date: Tue, 30 Jun 2026 12:37:52 +0200 Subject: [PATCH 1/3] XIVY-19081 adapt Multi-Select from Program protocol --- .../inscription-protocol/src/data/inscription.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/inscription-protocol/src/data/inscription.ts b/packages/inscription-protocol/src/data/inscription.ts index 55ed53afb..3813cbe1c 100644 --- a/packages/inscription-protocol/src/data/inscription.ts +++ b/packages/inscription-protocol/src/data/inscription.ts @@ -9,8 +9,8 @@ export type PID = string export type ContentObjectType = "STRING" | "FILE" | "FOLDER"; export type WfFieldType = "STRING" | "TEXT" | "NUMBER" | "TIMESTAMP"; -export type Widget = Script | Label | Text; -export type WidgetType = "TEXT" | "LABEL" | "SCRIPT"; +export type Widget = Script | Label | Text | MultiSelect; +export type WidgetType = "TEXT" | "LABEL" | "SCRIPT" | "MULTI_SELECT"; /** * Supports macros for dynamic content. * Macros are IvyScript expressions enclosed in '<%=' and '%>', enabling the embedding of dynamic values such as data class attributes. @@ -319,6 +319,17 @@ export interface Text { multiline: boolean; widgetType: WidgetType; } +export interface MultiSelect { + configKey: string; + items: SelectableItem[]; + multiline: boolean; + widgetType: WidgetType; +} +export interface SelectableItem { + description: string; + icon: string; + name: string; +} export interface InscriptionRequest { context: InscriptionElementContext; data: Data; From b78b0bc9573f9c32e4a7e62e8314251e0ed2bfb7 Mon Sep 17 00:00:00 2001 From: Reguel Wermelinger Date: Tue, 30 Jun 2026 12:53:29 +0200 Subject: [PATCH 2/3] XIVY-19081 multi-select as seen in RoleEditor --- integration/inscription/src/mock/meta-mock.ts | 32 +++++ packages/inscription-view/package.json | 1 + .../configuration/ConfigurationPart.tsx | 20 ++- .../multi-select/MultiSelectWidget.css | 122 ++++++++++++++++ .../multi-select/MultiSelectWidget.tsx | 130 ++++++++++++++++++ pnpm-lock.yaml | 90 ++++++++++++ 6 files changed, 394 insertions(+), 1 deletion(-) create mode 100644 packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.css create mode 100644 packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx diff --git a/integration/inscription/src/mock/meta-mock.ts b/integration/inscription/src/mock/meta-mock.ts index 6f442cfa8..cef43b01a 100644 --- a/integration/inscription/src/mock/meta-mock.ts +++ b/integration/inscription/src/mock/meta-mock.ts @@ -393,6 +393,38 @@ export namespace MetaMock { multiline: false } ] + }, + { + name: 'Model', + widgets: [ + { + items: [ + { + name: 'whoami', + description: 'identifies the current user', + icon: '🪪️' + }, + { + name: 'add', + description: 'calculation universe', + icon: 'https://imgcdn.stablediffusionweb.com/2024/12/15/3388743d-2e7a-4cd2-a17c-cba86a6573bd.jpg' + }, + { + name: 'weather', + description: 'provides weather information', + icon: '⛅️' + }, + { + name: 'websearch', + description: 'latest web search results', + icon: 'data:image/svg+xml;base64,<svg fill="none" viewBox="0 0 184 148" xmlns="http://www.w3.org/2000/svg">
  <path fill="#fff" d="M69.942 129.26H66.46l-6.338 6.517v-13.033h-2.678v22.228h2.678v-7.32l7.23 7.23.09.09h3.214v-.268l-8.124-8.034zm-17.14 11.873c-.982.982-2.41 1.518-4.017 1.518-2.767 0-5.534-1.696-5.534-5.624 0-3.303 2.32-5.624 5.534-5.624 1.428 0 2.767.536 3.839 1.518l.089.089 1.696-1.786-.09-.089c-1.606-1.517-3.48-2.232-5.623-2.232-4.91 0-8.213 3.303-8.213 8.124 0 5.624 4.106 8.123 8.213 8.123h.09c2.141 0 4.195-.803 5.623-2.321l.09-.089-1.786-1.785zm-18.122-3.481c0 2.856-1.963 4.999-4.73 5.088-2.946 0-4.732-1.785-4.732-4.82v-8.66H22.54v8.66c0 4.463 2.678 7.32 6.874 7.32h.09c2.052 0 3.927-.982 5.177-2.5l.089-.179.09 2.411h2.499V129.26H34.68zM8.347 122.655H.223v22.317h8.124c7.766 0 11.158-5.713 11.158-11.337 0-5.267-3.481-10.98-11.158-10.98zm8.39 10.89c0 4.285-2.588 8.57-8.301 8.57H3.08v-16.693h5.267c5.713 0 8.39 4.196 8.39 8.123zm138.277 1.697h6.874v5.177c-1.696 1.428-3.749 2.232-5.981 2.232-6.07 0-8.838-4.374-8.838-8.659 0-4.374 2.768-9.106 8.749-9.106 2.41 0 4.642.893 6.427 2.5l.089.089 1.607-1.874-.089-.09c-2.143-2.142-4.999-3.213-8.124-3.213-3.392 0-6.248 1.071-8.302 3.213-2.142 2.143-3.302 5.178-3.213 8.57 0 5.267 3.035 11.337 11.605 11.337h.178c3.214 0 6.249-1.339 8.391-3.749v-8.838h-9.462v2.411zm-73.735-12.587h-8.124v22.317h8.124c7.766 0 11.158-5.713 11.158-11.337 0-5.267-3.481-10.98-11.158-10.98zm8.39 10.89c0 4.285-2.588 8.57-8.301 8.57h-5.267v-16.693h5.267c5.624 0 8.302 4.196 8.302 8.123zm85.609-4.642c-4.731 0-8.123 3.482-8.123 8.213s3.392 8.124 8.123 8.124 8.213-3.393 8.213-8.124c0-4.82-3.392-8.213-8.213-8.213zm5.535 8.213c0 3.303-2.321 5.624-5.535 5.624-3.124 0-5.445-2.321-5.445-5.624 0-3.392 2.232-5.802 5.534-5.802 3.125.089 5.446 2.499 5.446 5.802zm-73.2.536c0 2.856-1.964 4.999-4.731 5.088-2.946 0-4.731-1.785-4.731-4.82v-8.66h-2.679v8.66c0 4.463 2.679 7.32 6.785 7.32h.089c2.053 0 3.928-.982 5.178-2.5l.089-.179.089 2.411h2.5V129.26h-2.678v8.392zm18.121 3.481c-.982.982-2.41 1.518-4.017 1.518-2.767 0-5.534-1.696-5.534-5.624 0-3.303 2.321-5.624 5.534-5.624 1.429 0 2.768.536 3.839 1.518l.089.089 1.696-1.786-.089-.089c-1.607-1.517-3.482-2.232-5.624-2.232-4.91 0-8.213 3.303-8.213 8.124 0 5.624 4.107 8.123 8.213 8.123h.089c2.143 0 4.196-.803 5.624-2.321l.089-.089-1.785-1.785zm17.14-11.873h-3.482l-6.338 6.517v-13.033h-2.678v22.228h2.678v-7.32l7.231 7.23.089.09h3.214v-.268l-8.123-8.034z"/>
  <path fill="#de5833" fill-rule="evenodd" d="M91.946 107.122c29.581 0 53.561-23.98 53.561-53.561S121.527 0 91.947 0C62.364 0 38.384 23.98 38.384 53.561s23.98 53.561 53.561 53.561z" clip-rule="evenodd"/>
  <path fill="#ddd" fill-rule="evenodd" d="M99.478 93.522c0-.418.103-.513-1.227-3.165-3.535-7.079-7.088-17.059-5.472-23.495.294-1.17-3.33-43.304-5.892-44.661-2.848-1.518-6.351-3.925-9.556-4.46-1.626-.26-3.758-.138-5.425.087-.296.04-.308.572-.025.668 1.094.37 2.423 1.014 3.206 1.988.148.184-.051.474-.287.482-.738.028-2.077.337-3.844 1.838-.204.173-.035.495.228.443 3.797-.75 7.674-.38 9.96 1.696.148.135.07.377-.123.43C61.19 30.76 65.117 48.01 70.396 69.177c4.654 18.666 6.435 24.81 7.012 26.727a.72.72 0 0 0 .424.469c6.85 2.697 21.646 2.805 21.646-1.805z" clip-rule="evenodd"/>
  <path fill="#fff" d="M102.198 97.498c-2.406.941-7.114 1.36-9.833 1.36-3.988 0-9.73-.628-11.821-1.57-1.293-3.976-5.16-16.303-8.978-31.956l-.374-1.53-.003-.012c-4.54-18.542-8.248-33.687 12.074-38.445.185-.043.276-.265.153-.411-2.331-2.766-6.7-3.673-12.222-1.768-.227.079-.424-.15-.283-.344 1.083-1.493 3.2-2.64 4.244-3.144.216-.104.203-.42-.025-.491a23.299 23.299 0 0 0-3.156-.753c-.31-.05-.338-.58-.027-.623 7.83-1.053 16.006 1.298 20.109 6.466a.272.272 0 0 0 .155.096c15.024 3.226 16.1 26.977 14.369 28.059-.341.213-1.434.09-2.877-.07-5.846-.655-17.422-1.95-7.868 15.856.094.176-.03.409-.228.44-5.388.837 1.517 17.719 6.591 28.84z"/>
  <path fill="#3ca82b" d="M108.919 75.904c-1.144-.53-5.542 2.624-8.461 5.045-.61-.863-1.76-1.49-4.355-1.04-2.27.396-3.524.943-4.084 1.887-3.584-1.359-9.614-3.456-11.07-1.43-1.593 2.214.397 12.687 2.512 14.047 1.104.71 6.386-2.685 9.144-5.026.445.627 1.162.986 2.634.952 2.228-.052 5.841-.57 6.401-1.608.034-.063.064-.137.089-.222 2.835 1.06 7.824 2.18 8.939 2.014 2.905-.437-.405-13.996-1.749-14.619z"/>
  <path fill="#4cba3c" d="M100.725 81.26c.121.214.217.44.3.67.404 1.13 1.062 4.726.564 5.614-.498.888-3.732 1.317-5.727 1.351s-2.444-.695-2.848-1.825c-.324-.904-.483-3.03-.479-4.247-.082-1.806.578-2.44 3.627-2.934 2.257-.365 3.45.06 4.138.786 3.204-2.39 8.549-5.765 9.07-5.148 2.6 3.075 2.928 10.394 2.365 13.34-.184.962-8.791-.955-8.791-1.993 0-4.311-1.119-5.494-2.219-5.615zM81.87 79.913c.706-1.116 6.422.272 9.56 1.668 0 0-.644 2.922.382 6.364.3 1.007-7.22 5.488-8.201 4.717-1.134-.891-3.222-10.404-1.74-12.75z"/>
  <path fill="#fc3" fill-rule="evenodd" d="M84.64 57.249c.462-2.012 2.617-5.802 10.31-5.71 3.89-.016 8.722-.001 11.926-.365a42.885 42.885 0 0 0 10.65-2.59c3.331-1.27 4.513-.988 4.927-.227.456.835-.081 2.278-1.245 3.606-2.223 2.536-6.219 4.502-13.277 5.085-7.058.583-11.734-1.31-13.746 1.772-.868 1.33-.197 4.463 6.628 5.45 9.223 1.33 16.798-1.604 17.734.168s-4.455 5.38-13.693 5.455c-9.239.076-15.009-3.234-17.055-4.88-2.597-2.087-3.758-5.132-3.16-7.764z" clip-rule="evenodd"/>
  <g fill="#14307e" opacity=".8">
    <path d="M96.404 35.256c.516-.844 1.658-1.495 3.528-1.495s2.75.744 3.359 1.573c.124.17-.064.368-.256.285l-.14-.061c-.684-.299-1.524-.666-2.963-.686-1.538-.022-2.508.363-3.12.695-.205.112-.53-.111-.408-.311zm-21.053 1.079c1.816-.759 3.243-.66 4.252-.422.213.05.36-.178.19-.315-.783-.632-2.535-1.416-4.821-.564-2.039.76-3 2.34-3.006 3.379-.001.245.503.265.633.058.352-.56.937-1.377 2.752-2.136z"/>
    <path fill-rule="evenodd" d="M101.521 46.799c-1.606 0-2.908-1.299-2.908-2.897s1.302-2.897 2.908-2.897c1.605 0 2.907 1.299 2.907 2.897s-1.302 2.897-2.907 2.897zm2.047-3.857a.752.752 0 0 0-1.505 0 .752.752 0 0 0 1.505 0zm-21.31 2.965a3.383 3.383 0 0 1-3.389 3.378c-1.87 0-3.389-1.513-3.389-3.378s1.52-3.379 3.389-3.379a3.385 3.385 0 0 1 3.389 3.379zm-.999-1.12a.878.878 0 0 0-1.755 0 .876.876 0 0 0 1.755 0z" clip-rule="evenodd"/>
  </g>
  <path fill="#fff" fill-rule="evenodd" d="M91.946 98.544c24.843 0 44.983-20.14 44.983-44.983 0-24.843-20.14-44.983-44.983-44.983-24.843 0-44.983 20.14-44.983 44.983 0 24.843 20.14 44.983 44.983 44.983zm0 4.184c27.154 0 49.167-22.013 49.167-49.167S119.1 4.394 91.946 4.394 42.78 26.407 42.78 53.56s22.013 49.167 49.167 49.167z" clip-rule="evenodd"/>
</svg>
' + } + ], + widgetType: 'MULTI_SELECT', + configKey: 'tools', + multiline: false + } + ] } ]; diff --git a/packages/inscription-view/package.json b/packages/inscription-view/package.json index 2e682a5ab..e3981e643 100644 --- a/packages/inscription-view/package.json +++ b/packages/inscription-view/package.json @@ -26,6 +26,7 @@ "@axonivy/jsonrpc": "~14.0.0-next", "@axonivy/ui-components": "~14.0.0-next", "@axonivy/ui-icons": "~14.0.0-next", + "@base-ui/react": "^1.0", "@radix-ui/react-dialog": "^1.1", "@radix-ui/react-tabs": "^1.1", "@tanstack/react-query": "^5.64", diff --git a/packages/inscription-view/src/components/parts/program/configuration/ConfigurationPart.tsx b/packages/inscription-view/src/components/parts/program/configuration/ConfigurationPart.tsx index 1e9949678..1cfe5657d 100644 --- a/packages/inscription-view/src/components/parts/program/configuration/ConfigurationPart.tsx +++ b/packages/inscription-view/src/components/parts/program/configuration/ConfigurationPart.tsx @@ -1,4 +1,4 @@ -import type { ConfigurationData, Label, Script, Text, Widget } from '@axonivy/process-editor-inscription-protocol'; +import type { ConfigurationData, Label, MultiSelect, Script, Text, Widget } from '@axonivy/process-editor-inscription-protocol'; import { IVY_SCRIPT_TYPES } from '@axonivy/process-editor-inscription-protocol'; import { Flex, Message } from '@axonivy/ui-components'; import { IvyIcons } from '@axonivy/ui-icons'; @@ -10,6 +10,7 @@ import { usePartState, type PartProps } from '../../../editors/part/usePart'; import { MacroArea } from '../../../widgets/code-editor/MacroArea'; import { MacroInput } from '../../../widgets/code-editor/MacroInput'; import { ScriptInput } from '../../../widgets/code-editor/ScriptInput'; +import { MultiSelectWidget } from '../../../widgets/multi-select/MultiSelectWidget'; import { PathCollapsible } from '../../common/path/PathCollapsible'; import './Configuration.css'; import { useConfigurationData } from './useConfigurationData'; @@ -47,6 +48,10 @@ const ConfigurationPart = () => { return object.widgetType == 'TEXT'; } + function isMultiSelect(object: Widget): object is MultiSelect { + return object.widgetType === 'MULTI_SELECT'; + } + const renderWidgetComponent = (widget: Widget) => { if (isLabel(widget)) { const message = widget.text; @@ -98,6 +103,19 @@ const ConfigurationPart = () => { /> ); } + if (isMultiSelect(widget)) { + const multiSelectWidget = widget as MultiSelect; + const selectedValue = config.userConfig[multiSelectWidget.configKey] ?? ''; + const value = typeof selectedValue === 'string' && selectedValue.length > 0 ? selectedValue.split(',').map(v => v.trim()) : []; + return ( + updateUserConfig(multiSelectWidget.configKey, change.join(', '))} + items={multiSelectWidget.items} + configKey={multiSelectWidget.configKey} + /> + ); + } return null; }; diff --git a/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.css b/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.css new file mode 100644 index 000000000..830a2a0bd --- /dev/null +++ b/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.css @@ -0,0 +1,122 @@ +.ui-combobox-root { + min-height: 2.25rem; + display: flex; + flex-wrap: wrap; + align-items: center; + gap: var(--size-1); + border-radius: var(--border-r1); + border: 1px solid var(--border-input-color); + background-color: var(--N25); + padding: var(--size-0-75); + transition: border-color 200ms ease; +} + +.ui-combobox-root:focus-within { + border-color: var(--border-active); + outline: none; +} + +.ui-combobox-root-chip { + display: flex; + height: 1.25rem; + align-items: center; + gap: var(--size-1); + overflow: hidden; + border-radius: var(--border-r1); + background-color: var(--N100); + padding: var(--size-0-5) var(--size-0-5) var(--size-0-5) var(--size-1); + font-size: var(--font-body); + outline: none; +} + +.ui-combobox-root-chip:focus-within { + background-color: var(--P75); +} + +.ui-combobox-root-chip:hover { + background-color: var(--P75); +} + +.ui-combobox-root-input { + margin: 0; + width: 100%; + min-width: 0; + flex: 1 1 auto; + border: none; + background: transparent; + font-size: var(--font-body); + outline: none; +} + +.ui-combobox-popup { + max-height: min(var(--available-height), 23rem); + overflow: auto; + border-radius: var(--border-r1); + border: 1px solid var(--N100); + background-color: var(--background); + padding: var(--size-1); + font-size: var(--font-body); + box-shadow: var(--shadow-lg); + animation: combobox-popup-enter 0.2s ease-out; +} + +.ui-combobox-popup[data-starting-style] { + animation: combobox-popup-exit 0.2s ease-in; +} + +@keyframes combobox-popup-enter { + from { + transform: scale(0.95); + opacity: 0; + } + to { + transform: scale(1); + opacity: 1; + } +} + +@keyframes combobox-popup-exit { + to { + transform: scale(0.95); + opacity: 0; + } +} + +.ui-combobox-item { + position: relative; + display: flex; + height: 1.9375rem; + align-items: center; + padding: var(--size-2) var(--size-2) var(--size-2) 2rem; + outline: none; + user-select: none; + cursor: pointer; + border-radius: var(--border-r1); + transition: background-color 100ms ease; +} + +.ui-combobox-item[data-highlighted]:not([data-selected]) { + background-color: var(--P50); +} + +.ui-combobox-item[data-selected] { + background-color: var(--P300); + color: var(--background); + z-index: 0; +} + +.ui-combobox-item-indicator { + position: absolute; + left: var(--size-2); + display: flex; + align-items: center; + justify-content: center; + width: 0.875rem; + height: 0.875rem; +} + +.ui-combobox-empty { + padding: var(--size-2); + line-height: 1; + color: var(--N700); +} diff --git a/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx b/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx new file mode 100644 index 000000000..d2536b57e --- /dev/null +++ b/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx @@ -0,0 +1,130 @@ +import { Button, Flex, IvyIcon, useField, useReadonly } from '@axonivy/ui-components'; +import { IvyIcons } from '@axonivy/ui-icons'; +import { Combobox } from '@base-ui/react/combobox'; +import React, { useMemo, useRef } from 'react'; +import './MultiSelectWidget.css'; + +type SelectableItem = { + name: string; + description: string; + icon: string; +}; + +type MultiSelectWidgetProps = { + value: string[]; + onChange: (value: string[]) => void; + items: SelectableItem[]; + configKey: string; +}; + +function isImageUrl(url: string): boolean { + if (!url) return false; + return url.startsWith('http://') || url.startsWith('https://') || url.startsWith('/') || url.startsWith('data:'); +} + +function renderIcon(icon: string): React.ReactNode { + if (!icon || icon === '') return null; + return isImageUrl(icon) + ? + : ; +} + +export function MultiSelectWidget({ value, onChange, items, configKey }: MultiSelectWidgetProps) { + const containerRef = useRef(null); + const { inputProps } = useField(); + const readonly = useReadonly(); + + const itemIds = useMemo(() => items.map(item => item.name), [items]); + + const mergedItems = useMemo(() => { + const merged = [...items]; + const mergedIds = merged.map(item => item.name); + value.filter(v => !mergedIds.includes(v)).forEach(v => merged.push({ name: v, description: '', icon: '' })); + return merged; + }, [items, value]); + + return ( + + + + {(selectedItems: string[]) => ( + <> + {selectedItems.map(itemName => { + const item = mergedItems.find(i => i.name === itemName); + return ( + + + {renderIcon(item?.icon || '')} + {itemName} + + } /> + + ); + })} + + + } /> + + + )} + + + + + + + + + {(itemName: string) => ( + + + + +
{itemLabel(itemName, mergedItems)}
+ + )} + + + + + + ); +} + +function itemLabel(itemName: string, items: SelectableItem[]): React.ReactNode { + const item = items.find(i => i.name === itemName); + if (!item) { + return itemName; + } + + if (item.icon && item.icon !== '') { + return ( + + {renderIcon(item.icon)} + {item.name} + {item.description && {` - ${item.description}`}} + + ); + } + + if (item.description) { + return ( + + {item.name} + {item.description && {` - ${item.description}`}} + + ); + } + + return item.name; +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6745cd94f..2ba2bbaf3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -385,6 +385,9 @@ importers: '@axonivy/process-editor-inscription-protocol': specifier: workspace:~ version: link:../inscription-protocol + '@base-ui/react': + specifier: ^1.0 + version: 1.6.0(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) '@radix-ui/react-dialog': specifier: ^1.1 version: 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) @@ -555,6 +558,33 @@ packages: resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==} engines: {node: '>=6.9.0'} + '@base-ui/react@1.6.0': + resolution: {integrity: sha512-/jzjTWJYXhRFO45Bev9lc3cHbmjzCMpUqbMZ2AgKy/z25mY9B6shGSNcXcjQar9n5doM0KYW1W8fcFv2jZBuMw==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@date-fns/tz': ^1.2.0 + '@types/react': ^17 || ^18 || ^19 + date-fns: ^4.0.0 + react: ^17 || ^18 || ^19 + react-dom: ^17 || ^18 || ^19 + peerDependenciesMeta: + '@date-fns/tz': + optional: true + '@types/react': + optional: true + date-fns: + optional: true + + '@base-ui/utils@0.3.1': + resolution: {integrity: sha512-gFFiltORVmW/N6IILTGxizP3PBpVpysqML1ALY5Vk0mH+7faVkCknOU31goYHN5Aoek2dkjxva1XOD2Ce9WuIg==} + peerDependencies: + '@types/react': ^17 || ^18 || ^19 + react: ^17 || ^18 || ^19 + react-dom: ^17 || ^18 || ^19 + peerDependenciesMeta: + '@types/react': + optional: true + '@bramus/specificity@2.4.2': resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==} hasBin: true @@ -757,18 +787,33 @@ packages: '@floating-ui/core@1.7.3': resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==} + '@floating-ui/core@1.7.5': + resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==} + '@floating-ui/dom@1.7.4': resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==} + '@floating-ui/dom@1.7.6': + resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==} + '@floating-ui/react-dom@2.1.6': resolution: {integrity: sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' + '@floating-ui/react-dom@2.1.8': + resolution: {integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==} + peerDependencies: + react: '>=16.8.0' + react-dom: '>=16.8.0' + '@floating-ui/utils@0.2.10': resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} + '@floating-ui/utils@0.2.11': + resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==} + '@gar/promise-retry@1.0.3': resolution: {integrity: sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==} engines: {node: ^20.17.0 || >=22.9.0} @@ -3807,6 +3852,9 @@ packages: resolution: {integrity: sha512-LBnkqsDE7BZKvqylbmn7lTIVdpx4K/QCduRATpO5R+wtPmky/a8pN1bO2D6wXppn1497AJF9mNjqAXr6bdl9jg==} engines: {node: '>=0.10.5'} + reselect@5.2.0: + resolution: {integrity: sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw==} + resolve-cwd@3.0.0: resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} engines: {node: '>=8'} @@ -4527,6 +4575,29 @@ snapshots: '@babel/runtime@7.29.7': {} + '@base-ui/react@1.6.0(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)': + dependencies: + '@babel/runtime': 7.29.7 + '@base-ui/utils': 0.3.1(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) + '@floating-ui/react-dom': 2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7) + '@floating-ui/utils': 0.2.11 + react: 19.2.7 + react-dom: 19.2.7(react@19.2.7) + use-sync-external-store: 1.6.0(react@19.2.7) + optionalDependencies: + '@types/react': 19.2.17 + + '@base-ui/utils@0.3.1(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)': + dependencies: + '@babel/runtime': 7.29.7 + '@floating-ui/utils': 0.2.11 + react: 19.2.7 + react-dom: 19.2.7(react@19.2.7) + reselect: 5.2.0 + use-sync-external-store: 1.6.0(react@19.2.7) + optionalDependencies: + '@types/react': 19.2.17 + '@bramus/specificity@2.4.2': dependencies: css-tree: 3.2.1 @@ -4758,19 +4829,36 @@ snapshots: dependencies: '@floating-ui/utils': 0.2.10 + '@floating-ui/core@1.7.5': + dependencies: + '@floating-ui/utils': 0.2.11 + '@floating-ui/dom@1.7.4': dependencies: '@floating-ui/core': 1.7.3 '@floating-ui/utils': 0.2.10 + '@floating-ui/dom@1.7.6': + dependencies: + '@floating-ui/core': 1.7.5 + '@floating-ui/utils': 0.2.11 + '@floating-ui/react-dom@2.1.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7)': dependencies: '@floating-ui/dom': 1.7.4 react: 19.2.7 react-dom: 19.2.7(react@19.2.7) + '@floating-ui/react-dom@2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7)': + dependencies: + '@floating-ui/dom': 1.7.6 + react: 19.2.7 + react-dom: 19.2.7(react@19.2.7) + '@floating-ui/utils@0.2.10': {} + '@floating-ui/utils@0.2.11': {} + '@gar/promise-retry@1.0.3': {} '@hediet/json-rpc-browser@0.5.1': @@ -7914,6 +8002,8 @@ snapshots: requireindex@1.1.0: {} + reselect@5.2.0: {} + resolve-cwd@3.0.0: dependencies: resolve-from: 5.0.0 From df9ea9263671b1a2a372d49a843f67e4c7792289 Mon Sep 17 00:00:00 2001 From: Reguel Wermelinger Date: Fri, 3 Jul 2026 14:16:45 +0200 Subject: [PATCH 3/3] adapt protocol --- integration/inscription/src/mock/meta-mock.ts | 12 +++-- .../src/data/inscription.ts | 5 +- .../multi-select/MultiSelectWidget.tsx | 49 ++++++++++--------- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/integration/inscription/src/mock/meta-mock.ts b/integration/inscription/src/mock/meta-mock.ts index cef43b01a..69fa18a42 100644 --- a/integration/inscription/src/mock/meta-mock.ts +++ b/integration/inscription/src/mock/meta-mock.ts @@ -400,22 +400,26 @@ export namespace MetaMock { { items: [ { - name: 'whoami', + id: 'whoami', + label: 'WhoAmI', description: 'identifies the current user', icon: '🪪️' }, { - name: 'add', + id: 'add', + label: 'Add', description: 'calculation universe', icon: 'https://imgcdn.stablediffusionweb.com/2024/12/15/3388743d-2e7a-4cd2-a17c-cba86a6573bd.jpg' }, { - name: 'weather', + id: 'weather', + label: 'Weather', description: 'provides weather information', icon: '⛅️' }, { - name: 'websearch', + id: 'websearch', + label: 'Web Search', description: 'latest web search results', icon: 'data:image/svg+xml;base64,<svg fill="none" viewBox="0 0 184 148" xmlns="http://www.w3.org/2000/svg">
  <path fill="#fff" d="M69.942 129.26H66.46l-6.338 6.517v-13.033h-2.678v22.228h2.678v-7.32l7.23 7.23.09.09h3.214v-.268l-8.124-8.034zm-17.14 11.873c-.982.982-2.41 1.518-4.017 1.518-2.767 0-5.534-1.696-5.534-5.624 0-3.303 2.32-5.624 5.534-5.624 1.428 0 2.767.536 3.839 1.518l.089.089 1.696-1.786-.09-.089c-1.606-1.517-3.48-2.232-5.623-2.232-4.91 0-8.213 3.303-8.213 8.124 0 5.624 4.106 8.123 8.213 8.123h.09c2.141 0 4.195-.803 5.623-2.321l.09-.089-1.786-1.785zm-18.122-3.481c0 2.856-1.963 4.999-4.73 5.088-2.946 0-4.732-1.785-4.732-4.82v-8.66H22.54v8.66c0 4.463 2.678 7.32 6.874 7.32h.09c2.052 0 3.927-.982 5.177-2.5l.089-.179.09 2.411h2.499V129.26H34.68zM8.347 122.655H.223v22.317h8.124c7.766 0 11.158-5.713 11.158-11.337 0-5.267-3.481-10.98-11.158-10.98zm8.39 10.89c0 4.285-2.588 8.57-8.301 8.57H3.08v-16.693h5.267c5.713 0 8.39 4.196 8.39 8.123zm138.277 1.697h6.874v5.177c-1.696 1.428-3.749 2.232-5.981 2.232-6.07 0-8.838-4.374-8.838-8.659 0-4.374 2.768-9.106 8.749-9.106 2.41 0 4.642.893 6.427 2.5l.089.089 1.607-1.874-.089-.09c-2.143-2.142-4.999-3.213-8.124-3.213-3.392 0-6.248 1.071-8.302 3.213-2.142 2.143-3.302 5.178-3.213 8.57 0 5.267 3.035 11.337 11.605 11.337h.178c3.214 0 6.249-1.339 8.391-3.749v-8.838h-9.462v2.411zm-73.735-12.587h-8.124v22.317h8.124c7.766 0 11.158-5.713 11.158-11.337 0-5.267-3.481-10.98-11.158-10.98zm8.39 10.89c0 4.285-2.588 8.57-8.301 8.57h-5.267v-16.693h5.267c5.624 0 8.302 4.196 8.302 8.123zm85.609-4.642c-4.731 0-8.123 3.482-8.123 8.213s3.392 8.124 8.123 8.124 8.213-3.393 8.213-8.124c0-4.82-3.392-8.213-8.213-8.213zm5.535 8.213c0 3.303-2.321 5.624-5.535 5.624-3.124 0-5.445-2.321-5.445-5.624 0-3.392 2.232-5.802 5.534-5.802 3.125.089 5.446 2.499 5.446 5.802zm-73.2.536c0 2.856-1.964 4.999-4.731 5.088-2.946 0-4.731-1.785-4.731-4.82v-8.66h-2.679v8.66c0 4.463 2.679 7.32 6.785 7.32h.089c2.053 0 3.928-.982 5.178-2.5l.089-.179.089 2.411h2.5V129.26h-2.678v8.392zm18.121 3.481c-.982.982-2.41 1.518-4.017 1.518-2.767 0-5.534-1.696-5.534-5.624 0-3.303 2.321-5.624 5.534-5.624 1.429 0 2.768.536 3.839 1.518l.089.089 1.696-1.786-.089-.089c-1.607-1.517-3.482-2.232-5.624-2.232-4.91 0-8.213 3.303-8.213 8.124 0 5.624 4.107 8.123 8.213 8.123h.089c2.143 0 4.196-.803 5.624-2.321l.089-.089-1.785-1.785zm17.14-11.873h-3.482l-6.338 6.517v-13.033h-2.678v22.228h2.678v-7.32l7.231 7.23.089.09h3.214v-.268l-8.123-8.034z"/>
  <path fill="#de5833" fill-rule="evenodd" d="M91.946 107.122c29.581 0 53.561-23.98 53.561-53.561S121.527 0 91.947 0C62.364 0 38.384 23.98 38.384 53.561s23.98 53.561 53.561 53.561z" clip-rule="evenodd"/>
  <path fill="#ddd" fill-rule="evenodd" d="M99.478 93.522c0-.418.103-.513-1.227-3.165-3.535-7.079-7.088-17.059-5.472-23.495.294-1.17-3.33-43.304-5.892-44.661-2.848-1.518-6.351-3.925-9.556-4.46-1.626-.26-3.758-.138-5.425.087-.296.04-.308.572-.025.668 1.094.37 2.423 1.014 3.206 1.988.148.184-.051.474-.287.482-.738.028-2.077.337-3.844 1.838-.204.173-.035.495.228.443 3.797-.75 7.674-.38 9.96 1.696.148.135.07.377-.123.43C61.19 30.76 65.117 48.01 70.396 69.177c4.654 18.666 6.435 24.81 7.012 26.727a.72.72 0 0 0 .424.469c6.85 2.697 21.646 2.805 21.646-1.805z" clip-rule="evenodd"/>
  <path fill="#fff" d="M102.198 97.498c-2.406.941-7.114 1.36-9.833 1.36-3.988 0-9.73-.628-11.821-1.57-1.293-3.976-5.16-16.303-8.978-31.956l-.374-1.53-.003-.012c-4.54-18.542-8.248-33.687 12.074-38.445.185-.043.276-.265.153-.411-2.331-2.766-6.7-3.673-12.222-1.768-.227.079-.424-.15-.283-.344 1.083-1.493 3.2-2.64 4.244-3.144.216-.104.203-.42-.025-.491a23.299 23.299 0 0 0-3.156-.753c-.31-.05-.338-.58-.027-.623 7.83-1.053 16.006 1.298 20.109 6.466a.272.272 0 0 0 .155.096c15.024 3.226 16.1 26.977 14.369 28.059-.341.213-1.434.09-2.877-.07-5.846-.655-17.422-1.95-7.868 15.856.094.176-.03.409-.228.44-5.388.837 1.517 17.719 6.591 28.84z"/>
  <path fill="#3ca82b" d="M108.919 75.904c-1.144-.53-5.542 2.624-8.461 5.045-.61-.863-1.76-1.49-4.355-1.04-2.27.396-3.524.943-4.084 1.887-3.584-1.359-9.614-3.456-11.07-1.43-1.593 2.214.397 12.687 2.512 14.047 1.104.71 6.386-2.685 9.144-5.026.445.627 1.162.986 2.634.952 2.228-.052 5.841-.57 6.401-1.608.034-.063.064-.137.089-.222 2.835 1.06 7.824 2.18 8.939 2.014 2.905-.437-.405-13.996-1.749-14.619z"/>
  <path fill="#4cba3c" d="M100.725 81.26c.121.214.217.44.3.67.404 1.13 1.062 4.726.564 5.614-.498.888-3.732 1.317-5.727 1.351s-2.444-.695-2.848-1.825c-.324-.904-.483-3.03-.479-4.247-.082-1.806.578-2.44 3.627-2.934 2.257-.365 3.45.06 4.138.786 3.204-2.39 8.549-5.765 9.07-5.148 2.6 3.075 2.928 10.394 2.365 13.34-.184.962-8.791-.955-8.791-1.993 0-4.311-1.119-5.494-2.219-5.615zM81.87 79.913c.706-1.116 6.422.272 9.56 1.668 0 0-.644 2.922.382 6.364.3 1.007-7.22 5.488-8.201 4.717-1.134-.891-3.222-10.404-1.74-12.75z"/>
  <path fill="#fc3" fill-rule="evenodd" d="M84.64 57.249c.462-2.012 2.617-5.802 10.31-5.71 3.89-.016 8.722-.001 11.926-.365a42.885 42.885 0 0 0 10.65-2.59c3.331-1.27 4.513-.988 4.927-.227.456.835-.081 2.278-1.245 3.606-2.223 2.536-6.219 4.502-13.277 5.085-7.058.583-11.734-1.31-13.746 1.772-.868 1.33-.197 4.463 6.628 5.45 9.223 1.33 16.798-1.604 17.734.168s-4.455 5.38-13.693 5.455c-9.239.076-15.009-3.234-17.055-4.88-2.597-2.087-3.758-5.132-3.16-7.764z" clip-rule="evenodd"/>
  <g fill="#14307e" opacity=".8">
    <path d="M96.404 35.256c.516-.844 1.658-1.495 3.528-1.495s2.75.744 3.359 1.573c.124.17-.064.368-.256.285l-.14-.061c-.684-.299-1.524-.666-2.963-.686-1.538-.022-2.508.363-3.12.695-.205.112-.53-.111-.408-.311zm-21.053 1.079c1.816-.759 3.243-.66 4.252-.422.213.05.36-.178.19-.315-.783-.632-2.535-1.416-4.821-.564-2.039.76-3 2.34-3.006 3.379-.001.245.503.265.633.058.352-.56.937-1.377 2.752-2.136z"/>
    <path fill-rule="evenodd" d="M101.521 46.799c-1.606 0-2.908-1.299-2.908-2.897s1.302-2.897 2.908-2.897c1.605 0 2.907 1.299 2.907 2.897s-1.302 2.897-2.907 2.897zm2.047-3.857a.752.752 0 0 0-1.505 0 .752.752 0 0 0 1.505 0zm-21.31 2.965a3.383 3.383 0 0 1-3.389 3.378c-1.87 0-3.389-1.513-3.389-3.378s1.52-3.379 3.389-3.379a3.385 3.385 0 0 1 3.389 3.379zm-.999-1.12a.878.878 0 0 0-1.755 0 .876.876 0 0 0 1.755 0z" clip-rule="evenodd"/>
  </g>
  <path fill="#fff" fill-rule="evenodd" d="M91.946 98.544c24.843 0 44.983-20.14 44.983-44.983 0-24.843-20.14-44.983-44.983-44.983-24.843 0-44.983 20.14-44.983 44.983 0 24.843 20.14 44.983 44.983 44.983zm0 4.184c27.154 0 49.167-22.013 49.167-49.167S119.1 4.394 91.946 4.394 42.78 26.407 42.78 53.56s22.013 49.167 49.167 49.167z" clip-rule="evenodd"/>
</svg>
' } diff --git a/packages/inscription-protocol/src/data/inscription.ts b/packages/inscription-protocol/src/data/inscription.ts index 3813cbe1c..bb602cd8c 100644 --- a/packages/inscription-protocol/src/data/inscription.ts +++ b/packages/inscription-protocol/src/data/inscription.ts @@ -85,7 +85,7 @@ export interface Inscription { schemaKey: SchemaKey; scriptingDataArgs: ScriptingDataArgs; signalCodeRequest: SignalCodeRequest; - string: string; + string: string[]; typeSearchRequest: TypeSearchRequest; validationResult: ValidationResult[]; variableInfo: VariableInfo; @@ -328,7 +328,8 @@ export interface MultiSelect { export interface SelectableItem { description: string; icon: string; - name: string; + id: string; + label: string; } export interface InscriptionRequest { context: InscriptionElementContext; diff --git a/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx b/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx index d2536b57e..d765bb7e8 100644 --- a/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx +++ b/packages/inscription-view/src/components/widgets/multi-select/MultiSelectWidget.tsx @@ -5,7 +5,8 @@ import React, { useMemo, useRef } from 'react'; import './MultiSelectWidget.css'; type SelectableItem = { - name: string; + id: string; + label: string; description: string; icon: string; }; @@ -24,9 +25,13 @@ function isImageUrl(url: string): boolean { function renderIcon(icon: string): React.ReactNode { if (!icon || icon === '') return null; - return isImageUrl(icon) - ? - : ; + return isImageUrl(icon) ? ( + + ) : ( + + ); } export function MultiSelectWidget({ value, onChange, items, configKey }: MultiSelectWidgetProps) { @@ -34,12 +39,12 @@ export function MultiSelectWidget({ value, onChange, items, configKey }: MultiSe const { inputProps } = useField(); const readonly = useReadonly(); - const itemIds = useMemo(() => items.map(item => item.name), [items]); + const itemIds = useMemo(() => items.map(item => item.id), [items]); const mergedItems = useMemo(() => { const merged = [...items]; - const mergedIds = merged.map(item => item.name); - value.filter(v => !mergedIds.includes(v)).forEach(v => merged.push({ name: v, description: '', icon: '' })); + const mergedIds = merged.map(item => item.id); + value.filter(v => !mergedIds.includes(v)).forEach(v => merged.push({ id: v, label: v, description: '', icon: '' })); return merged; }, [items, value]); @@ -49,18 +54,18 @@ export function MultiSelectWidget({ value, onChange, items, configKey }: MultiSe {(selectedItems: string[]) => ( <> - {selectedItems.map(itemName => { - const item = mergedItems.find(i => i.name === itemName); + {selectedItems.map(itemId => { + const item = mergedItems.find(i => i.id === itemId); return ( {renderIcon(item?.icon || '')} - {itemName} + {item?.label || itemId} } /> @@ -85,12 +90,12 @@ export function MultiSelectWidget({ value, onChange, items, configKey }: MultiSe - {(itemName: string) => ( - + {(itemId: string) => ( + -
{itemLabel(itemName, mergedItems)}
+
{itemLabel(itemId, mergedItems)}
 )} @@ -101,17 +106,17 @@ export function MultiSelectWidget({ value, onChange, items, configKey }: MultiSe ); } -function itemLabel(itemName: string, items: SelectableItem[]): React.ReactNode { - const item = items.find(i => i.name === itemName); +function itemLabel(itemId: string, items: SelectableItem[]): React.ReactNode { + const item = items.find(i => i.id === itemId); if (!item) { - return itemName; + return itemId; } if (item.icon && item.icon !== '') { return ( {renderIcon(item.icon)} - {item.name} + {item.label} {item.description && {` - ${item.description}`}} ); @@ -120,11 +125,11 @@ function itemLabel(itemName: string, items: SelectableItem[]): React.ReactNode { if (item.description) { return ( - {item.name} + {item.label} {item.description && {` - ${item.description}`}} ); } - return item.name; + return item.label; }