@uipath/apollo-react 7.26.0 → 7.28.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (124) hide show
  1. package/dist/decision-table/BandColumn.d.ts +2 -2
  2. package/dist/decision-table/BandColumn.d.ts.map +1 -1
  3. package/dist/decision-table/ColumnEditorOverlay.cjs +3 -3
  4. package/dist/decision-table/ColumnEditorOverlay.d.ts +6 -5
  5. package/dist/decision-table/ColumnEditorOverlay.d.ts.map +1 -1
  6. package/dist/decision-table/ColumnEditorOverlay.js +3 -3
  7. package/dist/decision-table/ColumnPopover.cjs +52 -31
  8. package/dist/decision-table/ColumnPopover.d.ts +36 -23
  9. package/dist/decision-table/ColumnPopover.d.ts.map +1 -1
  10. package/dist/decision-table/ColumnPopover.js +52 -31
  11. package/dist/decision-table/DecisionText.cjs +33 -11
  12. package/dist/decision-table/DecisionText.d.ts +23 -24
  13. package/dist/decision-table/DecisionText.d.ts.map +1 -1
  14. package/dist/decision-table/DecisionText.js +33 -11
  15. package/dist/decision-table/DecisionTextHeader.cjs +10 -8
  16. package/dist/decision-table/DecisionTextHeader.d.ts +13 -5
  17. package/dist/decision-table/DecisionTextHeader.d.ts.map +1 -1
  18. package/dist/decision-table/DecisionTextHeader.js +10 -8
  19. package/dist/decision-table/ValueFields.cjs +9 -5
  20. package/dist/decision-table/ValueFields.d.ts +0 -2
  21. package/dist/decision-table/ValueFields.d.ts.map +1 -1
  22. package/dist/decision-table/ValueFields.js +9 -5
  23. package/dist/decision-table/ValuePopover.cjs +18 -28
  24. package/dist/decision-table/ValuePopover.d.ts +5 -4
  25. package/dist/decision-table/ValuePopover.d.ts.map +1 -1
  26. package/dist/decision-table/ValuePopover.js +18 -28
  27. package/dist/decision-table/__fixtures__/diffSentences.fixtures.d.ts +9 -8
  28. package/dist/decision-table/__fixtures__/diffSentences.fixtures.d.ts.map +1 -1
  29. package/dist/decision-table/__fixtures__/editableSentences.fixtures.d.ts +5 -4
  30. package/dist/decision-table/__fixtures__/editableSentences.fixtures.d.ts.map +1 -1
  31. package/dist/decision-table/__fixtures__/sentences.fixtures.d.ts +25 -7
  32. package/dist/decision-table/__fixtures__/sentences.fixtures.d.ts.map +1 -1
  33. package/dist/decision-table/__fixtures__/storyTableHost.d.ts +16 -14
  34. package/dist/decision-table/__fixtures__/storyTableHost.d.ts.map +1 -1
  35. package/dist/decision-table/__fixtures__/textMode.d.ts +13 -5
  36. package/dist/decision-table/__fixtures__/textMode.d.ts.map +1 -1
  37. package/dist/decision-table/bandColumns.cjs +22 -35
  38. package/dist/decision-table/bandColumns.d.ts +2 -4
  39. package/dist/decision-table/bandColumns.d.ts.map +1 -1
  40. package/dist/decision-table/bandColumns.js +21 -31
  41. package/dist/decision-table/decisionTextDiff.d.ts +13 -12
  42. package/dist/decision-table/decisionTextDiff.d.ts.map +1 -1
  43. package/dist/decision-table/decisionTextTypes.d.ts +10 -7
  44. package/dist/decision-table/decisionTextTypes.d.ts.map +1 -1
  45. package/dist/decision-table/hostValues.cjs +90 -0
  46. package/dist/decision-table/hostValues.d.ts +13 -0
  47. package/dist/decision-table/hostValues.d.ts.map +1 -0
  48. package/dist/decision-table/hostValues.js +50 -0
  49. package/dist/decision-table/index.cjs +4 -4
  50. package/dist/decision-table/index.d.ts +9 -7
  51. package/dist/decision-table/index.d.ts.map +1 -1
  52. package/dist/decision-table/index.js +1 -1
  53. package/dist/decision-table/locales/de.cjs +1 -1
  54. package/dist/decision-table/locales/de.d.ts.map +1 -1
  55. package/dist/decision-table/locales/de.js +1 -1
  56. package/dist/decision-table/locales/en.cjs +1 -1
  57. package/dist/decision-table/locales/en.d.ts.map +1 -1
  58. package/dist/decision-table/locales/en.js +1 -1
  59. package/dist/decision-table/locales/es-MX.cjs +1 -1
  60. package/dist/decision-table/locales/es-MX.d.ts.map +1 -1
  61. package/dist/decision-table/locales/es-MX.js +1 -1
  62. package/dist/decision-table/locales/es.cjs +1 -1
  63. package/dist/decision-table/locales/es.d.ts.map +1 -1
  64. package/dist/decision-table/locales/es.js +1 -1
  65. package/dist/decision-table/locales/fr.cjs +1 -1
  66. package/dist/decision-table/locales/fr.d.ts.map +1 -1
  67. package/dist/decision-table/locales/fr.js +1 -1
  68. package/dist/decision-table/locales/ja.cjs +1 -1
  69. package/dist/decision-table/locales/ja.d.ts.map +1 -1
  70. package/dist/decision-table/locales/ja.js +1 -1
  71. package/dist/decision-table/locales/ko.cjs +1 -1
  72. package/dist/decision-table/locales/ko.d.ts.map +1 -1
  73. package/dist/decision-table/locales/ko.js +1 -1
  74. package/dist/decision-table/locales/pt-BR.cjs +1 -1
  75. package/dist/decision-table/locales/pt-BR.d.ts.map +1 -1
  76. package/dist/decision-table/locales/pt-BR.js +1 -1
  77. package/dist/decision-table/locales/pt.cjs +1 -1
  78. package/dist/decision-table/locales/pt.d.ts.map +1 -1
  79. package/dist/decision-table/locales/pt.js +1 -1
  80. package/dist/decision-table/locales/ro.cjs +1 -1
  81. package/dist/decision-table/locales/ro.d.ts.map +1 -1
  82. package/dist/decision-table/locales/ro.js +1 -1
  83. package/dist/decision-table/locales/ru.cjs +1 -1
  84. package/dist/decision-table/locales/ru.d.ts.map +1 -1
  85. package/dist/decision-table/locales/ru.js +1 -1
  86. package/dist/decision-table/locales/tr.cjs +1 -1
  87. package/dist/decision-table/locales/tr.d.ts.map +1 -1
  88. package/dist/decision-table/locales/tr.js +1 -1
  89. package/dist/decision-table/locales/zh-CN.cjs +1 -1
  90. package/dist/decision-table/locales/zh-CN.d.ts.map +1 -1
  91. package/dist/decision-table/locales/zh-CN.js +1 -1
  92. package/dist/decision-table/locales/zh-TW.cjs +1 -1
  93. package/dist/decision-table/locales/zh-TW.d.ts.map +1 -1
  94. package/dist/decision-table/locales/zh-TW.js +1 -1
  95. package/dist/decision-table/sentenceTypes.d.ts +12 -8
  96. package/dist/decision-table/sentenceTypes.d.ts.map +1 -1
  97. package/dist/decision-table/useColumnEditing.cjs +7 -5
  98. package/dist/decision-table/useColumnEditing.d.ts +6 -6
  99. package/dist/decision-table/useColumnEditing.d.ts.map +1 -1
  100. package/dist/decision-table/useColumnEditing.js +7 -5
  101. package/dist/decision-table/useDecisionTextStrings.cjs +1 -5
  102. package/dist/decision-table/useDecisionTextStrings.d.ts.map +1 -1
  103. package/dist/decision-table/useDecisionTextStrings.js +1 -5
  104. package/dist/decision-table/useEditState.cjs +17 -1
  105. package/dist/decision-table/useEditState.d.ts +4 -2
  106. package/dist/decision-table/useEditState.d.ts.map +1 -1
  107. package/dist/decision-table/useEditState.js +17 -1
  108. package/dist/decision-table/useHostValueEdit.cjs +91 -0
  109. package/dist/decision-table/useHostValueEdit.d.ts +5 -0
  110. package/dist/decision-table/useHostValueEdit.d.ts.map +1 -0
  111. package/dist/decision-table/useHostValueEdit.js +57 -0
  112. package/dist/decision-table/usePendingCondition.cjs +6 -5
  113. package/dist/decision-table/usePendingCondition.d.ts.map +1 -1
  114. package/dist/decision-table/usePendingCondition.js +7 -6
  115. package/dist/decision-table/useShapeDraft.cjs +93 -65
  116. package/dist/decision-table/useShapeDraft.d.ts +17 -14
  117. package/dist/decision-table/useShapeDraft.d.ts.map +1 -1
  118. package/dist/decision-table/useShapeDraft.js +93 -62
  119. package/dist/decision-table/useValueEditing.cjs +3 -7
  120. package/dist/decision-table/useValueEditing.d.ts.map +1 -1
  121. package/dist/decision-table/useValueEditing.js +3 -7
  122. package/dist/decision-table/valueTypes.d.ts +57 -19
  123. package/dist/decision-table/valueTypes.d.ts.map +1 -1
  124. package/package.json +3 -3
@@ -1,31 +1,17 @@
1
1
  import type React from 'react';
2
+ import { type ColumnTypeOption } from './columnTypes';
2
3
  import { type DecisionTextHeaderProps } from './DecisionTextHeader';
3
4
  import { type DecisionTextDiff } from './decisionTextDiff';
4
5
  import type { DecisionTextEdit } from './decisionTextTypes';
6
+ import { type HitPolicyCatalog, type HitPolicyPick } from './hitPolicyMenu';
5
7
  import { type TableMarks } from './marks';
6
- import type { SentenceBandColumn, SentenceHeader, SentenceRule, SentenceSelection } from './sentenceTypes';
8
+ import type { DecisionTextTable, SentenceSelection } from './sentenceTypes';
7
9
  import { useCellHover } from './useCellHover';
8
10
  import { type ContainerHandlersParams, type DecisionTextContainerProps } from './useContainerHandlers';
9
11
  import { type DecisionTextScroll } from './useRuleWindow';
10
12
  import { type SentenceNavigationSource } from './useSentenceNavigation';
11
- interface DecisionTextBaseProps {
12
- rules: readonly SentenceRule[];
13
- inputs: readonly SentenceBandColumn[];
14
- outputs: readonly SentenceBandColumn[];
15
- header: SentenceHeader;
16
- numbered?: boolean;
17
- marks?: TableMarks;
18
- onCellHover?: Parameters<typeof useCellHover>[0];
19
- headerMark?: DecisionTextHeaderProps['mark'];
20
- onOpenDecision?: ContainerHandlersParams['onOpenDecision'];
21
- scroll?: DecisionTextScroll;
22
- ariaLabel: string;
23
- containerProps?: DecisionTextContainerProps;
24
- dataTestId: string;
25
- children?: React.ReactNode;
26
- }
27
13
  type SelectHandler = NonNullable<SentenceNavigationSource['onSelect']>;
28
- export type DecisionTextMode = {
14
+ export type DecisionTextMode<Op, Policy, Total, Type, Refusal> = {
29
15
  kind: 'read';
30
16
  selected: SentenceSelection | null;
31
17
  } | {
@@ -36,16 +22,29 @@ export type DecisionTextMode = {
36
22
  kind: 'edit';
37
23
  selected: SentenceSelection | null;
38
24
  onSelect: SelectHandler;
39
- edit: DecisionTextEdit;
25
+ edit: DecisionTextEdit<Op, Type, Refusal>;
26
+ onPolicyChange: (picked: HitPolicyPick<Policy, Total>) => void;
40
27
  onAddRule: () => void;
41
- policy?: NonNullable<DecisionTextHeaderProps['policy']>;
42
28
  } | {
43
29
  kind: 'diff';
44
- diff: DecisionTextDiff;
30
+ diff: DecisionTextDiff<Policy, Total, Type>;
45
31
  };
46
- export interface DecisionTextProps extends DecisionTextBaseProps {
47
- mode: DecisionTextMode;
32
+ export interface DecisionTextProps<Op, Policy, Total, Type, Refusal> {
33
+ table: DecisionTextTable<Policy, Total, Type>;
34
+ mode: DecisionTextMode<Op, Policy, Total, Type, Refusal>;
35
+ hitPolicies: HitPolicyCatalog<Policy, Total>;
36
+ columnTypes: readonly ColumnTypeOption<Type>[];
37
+ numbered?: boolean;
38
+ marks?: TableMarks;
39
+ onCellHover?: Parameters<typeof useCellHover>[0];
40
+ headerMark?: DecisionTextHeaderProps['mark'];
41
+ onOpenDecision?: ContainerHandlersParams['onOpenDecision'];
42
+ scroll?: DecisionTextScroll;
43
+ ariaLabel: string;
44
+ containerProps?: DecisionTextContainerProps;
45
+ dataTestId: string;
46
+ children?: React.ReactNode;
48
47
  }
49
- export declare const DecisionText: React.FC<DecisionTextProps>;
48
+ export declare const DecisionText: <Op, Policy, Total, Type, Refusal>({ table, mode, hitPolicies, columnTypes, numbered, marks, onCellHover, headerMark, onOpenDecision, scroll, ariaLabel, containerProps, dataTestId, children, }: DecisionTextProps<Op, Policy, Total, Type, Refusal>) => React.JSX.Element;
50
49
  export {};
51
50
  //# sourceMappingURL=DecisionText.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DecisionText.d.ts","sourceRoot":"","sources":["../../src/decision-table/DecisionText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAsB,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,KAAK,gBAAgB,EAA6B,MAAM,oBAAoB,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAMvD,OAAO,KAAK,EAEV,kBAAkB,EAClB,cAAc,EAEd,YAAY,EACZ,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,0BAA0B,EAEhC,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,KAAK,kBAAkB,EAAiB,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAE,KAAK,wBAAwB,EAAyB,MAAM,yBAAyB,CAAC;AAI/F,UAAU,qBAAqB;IAC7B,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAE/B,MAAM,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAEtC,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACvC,MAAM,EAAE,cAAc,CAAC;IAEvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,UAAU,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAE7C,cAAc,CAAC,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAE3D,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAE5B,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAE5C,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAGD,KAAK,aAAa,GAAG,WAAW,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC;AAGvE,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC/E;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnC,QAAQ,EAAE,aAAa,CAAC;IACxB,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,MAAM,IAAI,CAAC;IAEtB,MAAM,CAAC,EAAE,WAAW,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;CACzD,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEN,MAAM,WAAW,iBAAkB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAmBD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA0MpD,CAAC"}
1
+ {"version":3,"file":"DecisionText.d.ts","sourceRoot":"","sources":["../../src/decision-table/DecisionText.tsx"],"names":[],"mappings":"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"}
@@ -1,13 +1,16 @@
1
1
  import { jsx, jsxs } from "react/jsx-runtime";
2
2
  import { cn } from "@uipath/apollo-wind";
3
3
  import { useCallback, useId, useMemo, useState } from "react";
4
+ import { useSafeLingui } from "../i18n/useSafeLingui.js";
4
5
  import { AddRuleFooter } from "./AddRuleFooter.js";
5
6
  import { bandsOf } from "./bandColumns.js";
6
7
  import { ColumnEditorOverlay } from "./ColumnEditorOverlay.js";
8
+ import { glyphOf } from "./columnTypes.js";
7
9
  import { DecisionTextHeader } from "./DecisionTextHeader.js";
8
10
  import { diffColumnsOf, diffRowsOf } from "./decisionTextDiff.js";
9
11
  import { EmptyRules } from "./EmptyRules.js";
10
12
  import { GridContextMenu } from "./GridMenu.js";
13
+ import { policyHeaderOf, policyMenuOf } from "./hitPolicyMenu.js";
11
14
  import { MarkTooltip } from "./MarkTooltip.js";
12
15
  import { EMPTY_MARKS } from "./marks.js";
13
16
  import { RuleList } from "./RuleList.js";
@@ -20,11 +23,12 @@ import { useCellHover } from "./useCellHover.js";
20
23
  import { useColumnEditing } from "./useColumnEditing.js";
21
24
  import { useContainerHandlers } from "./useContainerHandlers.js";
22
25
  import { useDecisionTextEditLabels, useDecisionTextLabels } from "./useDecisionTextStrings.js";
23
- import { useEditState } from "./useEditState.js";
26
+ import { useHostValueEdit } from "./useHostValueEdit.js";
24
27
  import { usePendingCondition } from "./usePendingCondition.js";
25
28
  import { useRuleMenus } from "./useRuleMenus.js";
26
29
  import { useRuleWindow } from "./useRuleWindow.js";
27
30
  import { useSentenceNavigation } from "./useSentenceNavigation.js";
31
+ import { useTextAnnouncements } from "./useTextAnnouncements.js";
28
32
  import { useValueEditing } from "./useValueEditing.js";
29
33
  import { ValueEditorOverlay } from "./ValueEditorOverlay.js";
30
34
  const NO_FOLDS = new Set();
@@ -43,27 +47,45 @@ const nameTokensOf = (bands)=>{
43
47
  text: columnId
44
48
  };
45
49
  };
46
- const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks = EMPTY_MARKS, onCellHover, mode, headerMark, onOpenDecision, scroll = 'self', ariaLabel, containerProps, dataTestId, children })=>{
50
+ const DecisionText = ({ table, mode, hitPolicies, columnTypes, numbered = false, marks = EMPTY_MARKS, onCellHover, headerMark, onOpenDecision, scroll = 'self', ariaLabel, containerProps, dataTestId, children })=>{
51
+ const { rules, inputs, outputs } = table;
47
52
  const selected = 'diff' === mode.kind ? null : mode.selected;
48
53
  const onSelect = 'select' === mode.kind || 'edit' === mode.kind ? mode.onSelect : void 0;
49
54
  const diff = 'diff' === mode.kind ? mode.diff : void 0;
50
55
  const idPrefix = useId();
56
+ const { _ } = useSafeLingui();
51
57
  const labels = useDecisionTextLabels();
52
- const hostEdit = 'edit' === mode.kind ? mode.edit : void 0;
53
- const { edit, refusal } = useEditState(hostEdit, useDecisionTextEditLabels());
58
+ const announcements = useTextAnnouncements(_, dataTestId);
59
+ const { edit, refusal } = useHostValueEdit('edit' === mode.kind ? mode.edit : void 0, [
60
+ ...inputs,
61
+ ...outputs
62
+ ], useDecisionTextEditLabels(), announcements);
54
63
  const addRule = 'edit' === mode.kind ? {
55
64
  label: labels.addRule,
56
65
  onAdd: mode.onAddRule
57
66
  } : void 0;
67
+ const policyHeader = policyHeaderOf(hitPolicies, table.hitPolicy);
68
+ const title = 'edit' === mode.kind ? {
69
+ kind: 'picker',
70
+ policy: policyMenuOf(hitPolicies, table.hitPolicy, mode.onPolicyChange, _)
71
+ } : diff?.hitPolicy ? {
72
+ kind: 'change',
73
+ before: policyHeaderOf(hitPolicies, diff.hitPolicy.before).label,
74
+ after: policyHeaderOf(hitPolicies, diff.hitPolicy.after).label
75
+ } : {
76
+ kind: 'label',
77
+ label: policyHeader.label
78
+ };
58
79
  const columns = useMemo(()=>diff && diffColumnsOf(inputs, outputs, diff), [
59
80
  inputs,
60
81
  outputs,
61
82
  diff
62
83
  ]);
63
- const bands = useMemo(()=>bandsOf(columns?.inputs ?? inputs, columns?.outputs ?? outputs, labels), [
84
+ const bands = useMemo(()=>bandsOf(columns?.inputs ?? inputs, columns?.outputs ?? outputs, (type)=>glyphOf(columnTypes, type), labels), [
64
85
  columns,
65
86
  inputs,
66
87
  outputs,
88
+ columnTypes,
67
89
  labels
68
90
  ]);
69
91
  const [folds, setFolds] = useState({
@@ -126,7 +148,7 @@ const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks
126
148
  stopTabbable: selectable && null !== ruleWindow.selectedRow
127
149
  });
128
150
  const columnEditing = useColumnEditing({
129
- column: edit?.column,
151
+ column: 'edit' === mode.kind ? mode.edit.column : void 0,
130
152
  bands,
131
153
  container: ruleWindow.container
132
154
  });
@@ -147,10 +169,9 @@ const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks
147
169
  children: [
148
170
  /*#__PURE__*/ jsx(DecisionTextHeader, {
149
171
  ref: ruleWindow.headerRef,
150
- header: header,
151
- policy: 'edit' === mode.kind ? mode.policy : void 0,
172
+ title: title,
173
+ hint: policyHeader.hint,
152
174
  mark: headerMark,
153
- hitPolicy: diff?.hitPolicy,
154
175
  labels: labels,
155
176
  sticky: 'self' === scroll,
156
177
  dataTestId: dataTestId
@@ -217,9 +238,9 @@ const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks
217
238
  container: ruleWindow.container,
218
239
  dataTestId: dataTestId
219
240
  }, valueEditing.editorKey),
220
- 'edit' === columnEditing.kind && columnEditing.editor && edit?.column && /*#__PURE__*/ jsx(ColumnEditorOverlay, {
241
+ 'edit' === columnEditing.kind && columnEditing.editor && edit && /*#__PURE__*/ jsx(ColumnEditorOverlay, {
221
242
  editor: columnEditing.editor,
222
- edit: edit.column,
243
+ types: columnTypes,
223
244
  labels: edit.labels,
224
245
  container: ruleWindow.container,
225
246
  id: columnEditorId,
@@ -236,6 +257,7 @@ const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks
236
257
  entries: ruleMenus.entries,
237
258
  onClose: ruleMenus.onClose
238
259
  }),
260
+ announcements.region,
239
261
  children
240
262
  ]
241
263
  });
@@ -70,7 +70,7 @@ const HitPolicyChange = ({ change, describedBy, labels })=>/*#__PURE__*/ (0, jsx
70
70
  })
71
71
  ]
72
72
  });
73
- const DecisionTextHeader = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef)(({ header, policy, mark, hitPolicy, labels, sticky, dataTestId }, ref)=>{
73
+ const DecisionTextHeader = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef)(({ title, hint, mark, labels, sticky, dataTestId }, ref)=>{
74
74
  const badgeId = (0, external_react_namespaceObject.useId)();
75
75
  const marks = (0, external_sentenceMarks_cjs_namespaceObject.isLineMark)(mark) ? [
76
76
  mark
@@ -81,18 +81,20 @@ const DecisionTextHeader = /*#__PURE__*/ (0, external_react_namespaceObject.forw
81
81
  className: sticky ? external_sentenceStyles_cjs_namespaceObject.DECISION_TEXT_HEADER_CLASS : (0, apollo_wind_namespaceObject.cn)(external_sentenceStyles_cjs_namespaceObject.DECISION_TEXT_HEADER_CLASS, 'static'),
82
82
  "data-testid": `${dataTestId}-header`,
83
83
  children: [
84
- hitPolicy ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(HitPolicyChange, {
85
- change: hitPolicy,
84
+ 'change' === title.kind && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(HitPolicyChange, {
85
+ change: title,
86
86
  describedBy: describedBy,
87
87
  labels: labels
88
- }) : policy ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_PolicyPicker_cjs_namespaceObject.PolicyPicker, {
89
- ...policy,
88
+ }),
89
+ 'picker' === title.kind && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_PolicyPicker_cjs_namespaceObject.PolicyPicker, {
90
+ ...title.policy,
90
91
  describedBy: describedBy,
91
92
  dataTestId: dataTestId
92
- }) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
93
+ }),
94
+ 'label' === title.kind && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
93
95
  className: external_sentenceStyles_cjs_namespaceObject.HEADER_LABEL_CLASS,
94
96
  "aria-describedby": describedBy,
95
- children: header.label
97
+ children: title.label
96
98
  }),
97
99
  marks && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_MarkBadge_cjs_namespaceObject.MarkBadge, {
98
100
  id: badgeId,
@@ -100,7 +102,7 @@ const DecisionTextHeader = /*#__PURE__*/ (0, external_react_namespaceObject.forw
100
102
  labels: labels
101
103
  }),
102
104
  /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
103
- children: header.hint
105
+ children: hint
104
106
  })
105
107
  ]
106
108
  });
@@ -1,14 +1,22 @@
1
1
  import type React from 'react';
2
- import type { DecisionTextDiff, DiffLabels } from './decisionTextDiff';
2
+ import type { DiffLabels } from './decisionTextDiff';
3
3
  import { type MarkBadgeProps } from './MarkBadge';
4
4
  import type { Mark } from './marks';
5
5
  import { type PolicyPickerProps } from './PolicyPicker';
6
- import type { SentenceHeader } from './sentenceTypes';
7
6
  export interface DecisionTextHeaderProps {
8
- header: SentenceHeader;
9
- policy: Omit<PolicyPickerProps, 'dataTestId' | 'describedBy'> | undefined;
7
+ title: {
8
+ kind: 'label';
9
+ label: string;
10
+ } | {
11
+ kind: 'picker';
12
+ policy: Omit<PolicyPickerProps, 'dataTestId' | 'describedBy'>;
13
+ } | {
14
+ kind: 'change';
15
+ before: string;
16
+ after: string;
17
+ };
18
+ hint: string;
10
19
  mark: Mark | undefined;
11
- hitPolicy: DecisionTextDiff['hitPolicy'];
12
20
  labels: MarkBadgeProps['labels'] & Pick<DiffLabels, 'previousValue' | 'currentValue'>;
13
21
  sticky: boolean;
14
22
  dataTestId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"DecisionTextHeader.d.ts","sourceRoot":"","sources":["../../src/decision-table/DecisionTextHeader.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAa,KAAK,cAAc,EAAW,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAgB,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAStE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,aAAa,CAAC,GAAG,SAAS,CAAC;IAE1E,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAEvB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACzC,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC;IAEtF,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD,eAAO,MAAM,kBAAkB,gGAyB9B,CAAC"}
1
+ {"version":3,"file":"DecisionTextHeader.d.ts","sourceRoot":"","sources":["../../src/decision-table/DecisionTextHeader.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAa,KAAK,cAAc,EAAW,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAgB,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAUtE,MAAM,WAAW,uBAAuB;IAEtC,KAAK,EACD;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAChC;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,aAAa,CAAC,CAAA;KAAE,GACjF;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAEtD,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC;IAEtF,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD,eAAO,MAAM,kBAAkB,gGA2B9B,CAAC"}
@@ -42,7 +42,7 @@ const HitPolicyChange = ({ change, describedBy, labels })=>/*#__PURE__*/ jsxs("s
42
42
  })
43
43
  ]
44
44
  });
45
- const DecisionTextHeader = /*#__PURE__*/ forwardRef(({ header, policy, mark, hitPolicy, labels, sticky, dataTestId }, ref)=>{
45
+ const DecisionTextHeader = /*#__PURE__*/ forwardRef(({ title, hint, mark, labels, sticky, dataTestId }, ref)=>{
46
46
  const badgeId = useId();
47
47
  const marks = isLineMark(mark) ? [
48
48
  mark
@@ -53,18 +53,20 @@ const DecisionTextHeader = /*#__PURE__*/ forwardRef(({ header, policy, mark, hit
53
53
  className: sticky ? DECISION_TEXT_HEADER_CLASS : cn(DECISION_TEXT_HEADER_CLASS, 'static'),
54
54
  "data-testid": `${dataTestId}-header`,
55
55
  children: [
56
- hitPolicy ? /*#__PURE__*/ jsx(HitPolicyChange, {
57
- change: hitPolicy,
56
+ 'change' === title.kind && /*#__PURE__*/ jsx(HitPolicyChange, {
57
+ change: title,
58
58
  describedBy: describedBy,
59
59
  labels: labels
60
- }) : policy ? /*#__PURE__*/ jsx(PolicyPicker, {
61
- ...policy,
60
+ }),
61
+ 'picker' === title.kind && /*#__PURE__*/ jsx(PolicyPicker, {
62
+ ...title.policy,
62
63
  describedBy: describedBy,
63
64
  dataTestId: dataTestId
64
- }) : /*#__PURE__*/ jsx("span", {
65
+ }),
66
+ 'label' === title.kind && /*#__PURE__*/ jsx("span", {
65
67
  className: HEADER_LABEL_CLASS,
66
68
  "aria-describedby": describedBy,
67
- children: header.label
69
+ children: title.label
68
70
  }),
69
71
  marks && /*#__PURE__*/ jsx(MarkBadge, {
70
72
  id: badgeId,
@@ -72,7 +74,7 @@ const DecisionTextHeader = /*#__PURE__*/ forwardRef(({ header, policy, mark, hit
72
74
  labels: labels
73
75
  }),
74
76
  /*#__PURE__*/ jsx("span", {
75
- children: header.hint
77
+ children: hint
76
78
  })
77
79
  ]
78
80
  });
@@ -36,16 +36,18 @@ const invalidEnds = ({ problem, text, high })=>{
36
36
  const missing = 'missingEnd' === problem;
37
37
  return {
38
38
  low: missing && '' === text.trim(),
39
- high: missing && '' === high.trim() || 'endsOutOfOrder' === problem
39
+ high: missing && '' === high.trim()
40
40
  };
41
41
  };
42
- const ValueFields = ({ draft, value, index, values, column, ariaLabel, onPick, onFieldsKeyDown, onValueKeyDown, focusRef, keyShortcuts, labels, describedBy, dataTestId })=>{
42
+ const ValueFields = ({ draft, index, column, ariaLabel, onPick, onFieldsKeyDown, onValueKeyDown, focusRef, keyShortcuts, labels, describedBy, dataTestId })=>{
43
43
  const { shape, text, allowedValues, listed, checked } = draft;
44
+ const held = draft.heldValueAt(index);
44
45
  const choices = allowedValues.length > 0;
45
46
  const allowed = new Set(allowedValues);
46
47
  const outsideAllowed = (options)=>choices ? [
47
48
  ...new Set(options)
48
49
  ].filter((option)=>'' !== option.trim() && !allowed.has(option)) : [];
50
+ if ('valueless' === shape) return null;
49
51
  if ('range' === shape) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
50
52
  onKeyDown: onFieldsKeyDown,
51
53
  children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_RangeFields_cjs_namespaceObject.RangeFields, {
@@ -74,7 +76,7 @@ const ValueFields = ({ draft, value, index, values, column, ariaLabel, onPick, o
74
76
  adding: draft.adding,
75
77
  onAddingChange: draft.setAdding,
76
78
  addLabel: labels.addValue,
77
- focused: values?.[index] ?? checked[0] ?? listed[0],
79
+ focused: draft.heldList[index] ?? checked[0] ?? listed[0],
78
80
  focusRef: focusRef,
79
81
  label: column,
80
82
  describedBy: describedBy,
@@ -87,8 +89,10 @@ const ValueFields = ({ draft, value, index, values, column, ariaLabel, onPick, o
87
89
  onKeyDown: onValueKeyDown,
88
90
  children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_AllowedValueList_cjs_namespaceObject.AllowedValueList, {
89
91
  values: allowedValues,
90
- notAllowed: outsideAllowed([
91
- value,
92
+ notAllowed: outsideAllowed(void 0 === held ? [
93
+ text
94
+ ] : [
95
+ held,
92
96
  text
93
97
  ]),
94
98
  notAllowedLabel: labels.notAllowed,
@@ -8,9 +8,7 @@ export interface ValueFieldsLabels extends RangeFieldsLabels {
8
8
  }
9
9
  export interface ValueFieldsProps {
10
10
  draft: ShapeDraft;
11
- value: string;
12
11
  index: number;
13
- values: readonly string[] | undefined;
14
12
  column: string;
15
13
  ariaLabel: string;
16
14
  onPick: AllowedValueListProps['onPick'];
@@ -1 +1 @@
1
- {"version":3,"file":"ValueFields.d.ts","sourceRoot":"","sources":["../../src/decision-table/ValueFields.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAA8B,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAE1D,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACxC,eAAe,EAAE,KAAK,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACzD,cAAc,EAAE,KAAK,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACxD,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,iBAAiB,CAAC;IAE1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAYD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAmGlD,CAAC"}
1
+ {"version":3,"file":"ValueFields.d.ts","sourceRoot":"","sources":["../../src/decision-table/ValueFields.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAA8B,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAE1D,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACxC,eAAe,EAAE,KAAK,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACzD,cAAc,EAAE,KAAK,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACxD,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,iBAAiB,CAAC;IAE1B,UAAU,EAAE,MAAM,CAAC;CACpB;AASD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAmGlD,CAAC"}
@@ -8,16 +8,18 @@ const invalidEnds = ({ problem, text, high })=>{
8
8
  const missing = 'missingEnd' === problem;
9
9
  return {
10
10
  low: missing && '' === text.trim(),
11
- high: missing && '' === high.trim() || 'endsOutOfOrder' === problem
11
+ high: missing && '' === high.trim()
12
12
  };
13
13
  };
14
- const ValueFields = ({ draft, value, index, values, column, ariaLabel, onPick, onFieldsKeyDown, onValueKeyDown, focusRef, keyShortcuts, labels, describedBy, dataTestId })=>{
14
+ const ValueFields = ({ draft, index, column, ariaLabel, onPick, onFieldsKeyDown, onValueKeyDown, focusRef, keyShortcuts, labels, describedBy, dataTestId })=>{
15
15
  const { shape, text, allowedValues, listed, checked } = draft;
16
+ const held = draft.heldValueAt(index);
16
17
  const choices = allowedValues.length > 0;
17
18
  const allowed = new Set(allowedValues);
18
19
  const outsideAllowed = (options)=>choices ? [
19
20
  ...new Set(options)
20
21
  ].filter((option)=>'' !== option.trim() && !allowed.has(option)) : [];
22
+ if ('valueless' === shape) return null;
21
23
  if ('range' === shape) return /*#__PURE__*/ jsx("div", {
22
24
  onKeyDown: onFieldsKeyDown,
23
25
  children: /*#__PURE__*/ jsx(RangeFields, {
@@ -46,7 +48,7 @@ const ValueFields = ({ draft, value, index, values, column, ariaLabel, onPick, o
46
48
  adding: draft.adding,
47
49
  onAddingChange: draft.setAdding,
48
50
  addLabel: labels.addValue,
49
- focused: values?.[index] ?? checked[0] ?? listed[0],
51
+ focused: draft.heldList[index] ?? checked[0] ?? listed[0],
50
52
  focusRef: focusRef,
51
53
  label: column,
52
54
  describedBy: describedBy,
@@ -59,8 +61,10 @@ const ValueFields = ({ draft, value, index, values, column, ariaLabel, onPick, o
59
61
  onKeyDown: onValueKeyDown,
60
62
  children: /*#__PURE__*/ jsx(AllowedValueList, {
61
63
  values: allowedValues,
62
- notAllowed: outsideAllowed([
63
- value,
64
+ notAllowed: outsideAllowed(void 0 === held ? [
65
+ text
66
+ ] : [
67
+ held,
64
68
  text
65
69
  ]),
66
70
  notAllowedLabel: labels.notAllowed,
@@ -37,11 +37,7 @@ const external_PopoverSelect_cjs_namespaceObject = require("./PopoverSelect.cjs"
37
37
  const external_sentenceStyles_cjs_namespaceObject = require("./sentenceStyles.cjs");
38
38
  const external_useShapeDraft_cjs_namespaceObject = require("./useShapeDraft.cjs");
39
39
  const external_ValueFields_cjs_namespaceObject = require("./ValueFields.cjs");
40
- const sameCommit = (a, b)=>{
41
- if ('expression' === a.kind) return 'expression' === b.kind && a.text === b.text;
42
- if ('expression' === b.kind) return false;
43
- return a.operator === b.operator && a.values.length === b.values.length && a.values.every((value, index)=>value === b.values[index]) && a.ends?.lowInclusive === b.ends?.lowInclusive && a.ends?.highInclusive === b.ends?.highInclusive;
44
- };
40
+ const sameCommit = (a, b)=>JSON.stringify(a) === JSON.stringify(b);
45
41
  const OPERATOR_SHORTCUTS = 'Alt+ArrowDown Alt+ArrowUp';
46
42
  const isListKey = (key)=>'ArrowDown' === key || 'ArrowUp' === key;
47
43
  const footerLinks = (editExpression, onClear, labels, dataTestId)=>[
@@ -63,7 +59,7 @@ const footerLinks = (editExpression, onClear, labels, dataTestId)=>[
63
59
  }
64
60
  ] : []
65
61
  ];
66
- const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef)(({ target, value, ariaLabel, column, field, adds, onCommit, onCancel, onOperatorChange, onClear, renderEditor, labels, refusal, dataTestId }, ref)=>{
62
+ const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef)(({ target, value, ariaLabel, column, icon, field, adds, onCommit, onCancel, onOperatorChange, onClear, renderEditor, labels, refusal, dataTestId }, ref)=>{
67
63
  const id = (0, external_react_namespaceObject.useId)();
68
64
  const problemId = `${id}-problem`;
69
65
  const refusalId = `${id}-refusal`;
@@ -75,9 +71,9 @@ const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef
75
71
  const draftRef = (0, external_react_namespaceObject.useRef)(value);
76
72
  const seedRef = (0, external_react_namespaceObject.useRef)(null);
77
73
  const shapeDraft = (0, external_useShapeDraft_cjs_namespaceObject.useShapeDraft)(field, value, adds);
78
- const { operators, current, problem } = shapeDraft;
74
+ const { picker, current, problem } = shapeDraft;
79
75
  const [opened] = (0, external_react_namespaceObject.useState)(current);
80
- const fieldsChanged = void 0 !== field.expression && !sameCommit(current, opened);
76
+ const fieldsChanged = 'outcome' !== field.kind && !sameCommit(current, opened);
81
77
  const expression = null !== seed;
82
78
  const holdFocus = (element)=>{
83
79
  focusRef.current = element;
@@ -108,20 +104,16 @@ const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef
108
104
  }));
109
105
  const pick = (next)=>{
110
106
  shapeDraft.setText(next);
111
- commit({
112
- kind: 'values',
113
- values: [
114
- next
115
- ],
116
- operator: shapeDraft.picked
117
- }, 'none');
107
+ commit(shapeDraft.commitOf(next), 'none');
118
108
  };
119
109
  const changeOperator = (id)=>{
120
- shapeDraft.changeOperator(id);
121
- onOperatorChange(id);
110
+ const picked = picker?.operators.find((option)=>option.id === id);
111
+ if (!picked) return;
112
+ shapeDraft.changeOperator(picked.place);
113
+ onOperatorChange(picked.place);
122
114
  };
123
115
  const openOperators = (event)=>{
124
- if (0 === operators.length || !event.altKey || !isListKey(event.key)) return false;
116
+ if (!picker || !event.altKey || !isListKey(event.key)) return false;
125
117
  event.preventDefault();
126
118
  setListOpen(true);
127
119
  return true;
@@ -139,18 +131,18 @@ const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef
139
131
  event.preventDefault();
140
132
  settle('down');
141
133
  };
142
- const editExpression = void 0 !== field.expression || 0 === operators.length ? ()=>{
143
- const opened = field.expression ?? shapeDraft.text;
134
+ const editExpression = ()=>{
135
+ const opened = 'condition' === field.kind ? field.expression : shapeDraft.text;
144
136
  seedRef.current = opened;
145
137
  changeDraft(opened);
146
138
  setSeed(opened);
147
- } : void 0;
139
+ };
148
140
  return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("div", {
149
141
  ref: setRoot,
150
142
  className: external_sentenceStyles_cjs_namespaceObject.POPOVER_CLASS,
151
143
  children: [
152
144
  /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_PopoverHeader_cjs_namespaceObject.PopoverHeader, {
153
- icon: field.icon,
145
+ icon: icon,
154
146
  column: column
155
147
  }),
156
148
  expression ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_ExpressionEditorFrame_cjs_namespaceObject.ExpressionEditorFrame, {
@@ -164,9 +156,9 @@ const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef
164
156
  dataTestId: `${dataTestId}-expression-editor`
165
157
  }) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
166
158
  children: [
167
- operators.length > 0 && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_PopoverSelect_cjs_namespaceObject.PopoverSelect, {
168
- value: shapeDraft.operator ?? '',
169
- options: operators,
159
+ picker && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_PopoverSelect_cjs_namespaceObject.PopoverSelect, {
160
+ value: String(picker.operator),
161
+ options: picker.operators,
170
162
  onChange: changeOperator,
171
163
  open: listOpen,
172
164
  onOpenChange: setListOpen,
@@ -177,16 +169,14 @@ const ValuePopover = /*#__PURE__*/ (0, external_react_namespaceObject.forwardRef
177
169
  }),
178
170
  /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_ValueFields_cjs_namespaceObject.ValueFields, {
179
171
  draft: shapeDraft,
180
- value: value,
181
172
  index: target.index,
182
- values: field.values,
183
173
  column: column,
184
174
  ariaLabel: ariaLabel,
185
175
  onPick: pick,
186
176
  onFieldsKeyDown: onFieldsKeyDown,
187
177
  onValueKeyDown: onValueKeyDown,
188
178
  focusRef: holdFocus,
189
- keyShortcuts: operators.length > 0 ? OPERATOR_SHORTCUTS : void 0,
179
+ keyShortcuts: picker ? OPERATOR_SHORTCUTS : void 0,
190
180
  describedBy: [
191
181
  problem && problemId,
192
182
  refusal && refusalId
@@ -4,7 +4,7 @@ import type { CellCommitMove, GridCellEditorContext } from './gridTypes';
4
4
  import { type PopoverFooterLabels } from './PopoverFooter';
5
5
  import { type DraftProblemLabels } from './useShapeDraft';
6
6
  import { type ValueFieldsLabels } from './ValueFields';
7
- import type { CommitRefusal, ExpressionEditorProps, ValueCommit, ValueField } from './valueTypes';
7
+ import type { CommitRefusal, ExpressionEditorProps, ValueCommit, ValueFieldData } from './valueTypes';
8
8
  export interface ValuePopoverLabels extends PopoverFooterLabels, ValueFieldsLabels, DraftProblemLabels {
9
9
  operator: string;
10
10
  editExpression: string;
@@ -15,10 +15,11 @@ export interface ValuePopoverHandle {
15
15
  }
16
16
  export interface ValuePopoverProps extends Pick<ExpressionEditorProps, 'target' | 'value' | 'ariaLabel'>, Pick<GridCellEditorContext, 'onCancel'> {
17
17
  column: string;
18
- field: ValueField;
18
+ icon: React.ReactNode;
19
+ field: ValueFieldData<number>;
19
20
  adds: boolean;
20
- onCommit: (commit: ValueCommit, move: CellCommitMove, refocus: boolean) => void;
21
- onOperatorChange: (id: string) => void;
21
+ onCommit: (commit: ValueCommit<number>, move: CellCommitMove, refocus: boolean) => void;
22
+ onOperatorChange: (place: number) => void;
22
23
  onClear: (() => void) | undefined;
23
24
  renderEditor: ExpressionEditorFrameProps['renderEditor'];
24
25
  labels: ValuePopoverLabels;
@@ -1 +1 @@
1
- {"version":3,"file":"ValuePopover.d.ts","sourceRoot":"","sources":["../../src/decision-table/ValuePopover.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAyB,KAAK,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAEjG,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAiB,KAAK,mBAAmB,EAA0B,MAAM,iBAAiB,CAAC;AAIlG,OAAO,EAAE,KAAK,kBAAkB,EAAiB,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAe,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAGlG,MAAM,WAAW,kBACf,SAAQ,mBAAmB,EACzB,iBAAiB,EACjB,kBAAkB;IAEpB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,kBAAkB;IAEjC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,iBACf,SAAQ,IAAI,CAAC,qBAAqB,EAAE,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC,EACnE,IAAI,CAAC,qBAAqB,EAAE,UAAU,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAElB,IAAI,EAAE,OAAO,CAAC;IAEd,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAEhF,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAEvC,OAAO,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAElC,YAAY,EAAE,0BAA0B,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,EAAE,kBAAkB,CAAC;IAE3B,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAE9B,UAAU,EAAE,MAAM,CAAC;CACpB;AAyCD,eAAO,MAAM,YAAY,8FA4KxB,CAAC"}
1
+ {"version":3,"file":"ValuePopover.d.ts","sourceRoot":"","sources":["../../src/decision-table/ValuePopover.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAyB,KAAK,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAEjG,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAiB,KAAK,mBAAmB,EAA0B,MAAM,iBAAiB,CAAC;AAIlG,OAAO,EAAE,KAAK,kBAAkB,EAAiB,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAe,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,WAAW,EACX,cAAc,EACf,MAAM,cAAc,CAAC;AAGtB,MAAM,WAAW,kBACf,SAAQ,mBAAmB,EACzB,iBAAiB,EACjB,kBAAkB;IAEpB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,kBAAkB;IAEjC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,iBACf,SAAQ,IAAI,CAAC,qBAAqB,EAAE,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC,EACnE,IAAI,CAAC,qBAAqB,EAAE,UAAU,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,EAAE,OAAO,CAAC;IAEd,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAExF,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAE1C,OAAO,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAElC,YAAY,EAAE,0BAA0B,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,EAAE,kBAAkB,CAAC;IAE3B,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAE9B,UAAU,EAAE,MAAM,CAAC;CACpB;AAgCD,eAAO,MAAM,YAAY,8FA6KxB,CAAC"}