@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,6 +1,5 @@
1
1
  import { useState } from "react";
2
2
  const NO_OPERATORS = [];
3
- const NO_VALUES = [];
4
3
  const BOTH_INCLUDED = {
5
4
  lowInclusive: true,
6
5
  highInclusive: true
@@ -8,50 +7,64 @@ const BOTH_INCLUDED = {
8
7
  const filled = (values)=>[
9
8
  ...new Set(values.filter((value)=>'' !== value.trim()))
10
9
  ];
11
- const operatorsOf = ({ operators = NO_OPERATORS, operator, values, ends })=>{
12
- const usable = operators.filter(({ id })=>'' !== id);
13
- return !operator || 0 === usable.length || usable.some(({ id })=>id === operator) ? usable : [
14
- {
15
- id: operator,
16
- label: operator,
17
- shape: ends ? 'range' : values ? 'list' : 'single'
18
- },
19
- ...usable
20
- ];
10
+ const operatorsOf = (field)=>'condition' === field.kind ? field.operators.map(({ operator, label, shape })=>({
11
+ id: String(operator),
12
+ place: operator,
13
+ label,
14
+ shape
15
+ })) : NO_OPERATORS;
16
+ const heldValuesOf = (held)=>{
17
+ switch(held.shape){
18
+ case 'single':
19
+ return [
20
+ held.value
21
+ ];
22
+ case 'range':
23
+ return [
24
+ held.low,
25
+ held.high
26
+ ];
27
+ case 'list':
28
+ return held.values;
29
+ case 'valueless':
30
+ return [];
31
+ }
21
32
  };
22
- const operatorOf = (field)=>field.operator || operatorsOf(field)[0]?.id;
23
- const problemOf = (shape, { values }, field, adds, hidesHeld)=>{
24
- const [low = '', high = ''] = values;
25
- if ('range' === shape) {
26
- if ('' === low.trim() || '' === high.trim()) return 'missingEnd';
27
- return field.inOrder?.(low, high) ?? true ? null : 'endsOutOfOrder';
33
+ const problemOf = (commit, adds, hidesHeld)=>{
34
+ switch(commit.kind){
35
+ case 'range':
36
+ return '' === commit.low.trim() || '' === commit.high.trim() ? 'missingEnd' : null;
37
+ case 'list':
38
+ return commit.values.length > 0 ? null : 'noValueChecked';
39
+ case 'valueless':
40
+ return null;
41
+ case 'expression':
42
+ return (adds || hidesHeld) && '' === commit.text.trim() ? 'missingValue' : null;
43
+ default:
44
+ return (adds || hidesHeld) && '' === commit.value.trim() ? 'missingValue' : null;
28
45
  }
29
- if ('list' === shape) return values.length > 0 ? null : 'noValueChecked';
30
- return (adds || hidesHeld) && '' === low.trim() ? 'missingValue' : null;
31
46
  };
32
47
  const useShapeDraft = (field, value, adds)=>{
33
- const [values, setValues] = useState(field.values ?? [
34
- value
35
- ]);
36
- const [ends, setEnds] = useState(field.ends ?? BOTH_INCLUDED);
37
- const [held] = useState(()=>filled(field.values ?? [
38
- value
39
- ]));
48
+ const opened = 'condition' === field.kind ? heldValuesOf(field.held) : [
49
+ 'expression' === field.kind ? field.expression : value
50
+ ];
51
+ const [values, setValues] = useState(opened);
52
+ const [ends, setEnds] = useState('condition' === field.kind && 'range' === field.held.shape ? field.held.ends : BOTH_INCLUDED);
53
+ const [held] = useState(()=>filled(opened));
40
54
  const [entries, setEntries] = useState(held);
41
55
  const [adding, setAdding] = useState('');
42
- const [operator, setOperator] = useState(()=>operatorOf(field));
56
+ const [operator, setOperator] = useState(()=>'condition' === field.kind ? field.held.operator : void 0);
43
57
  const operators = operatorsOf(field);
44
- const allowedValues = filled(field.allowedValues ?? NO_VALUES);
45
- const picked = 0 === operators.length ? void 0 : operator;
46
- const shapeOf = (id)=>operators.find((option)=>option.id === id)?.shape ?? 'single';
47
- const shape = shapeOf(picked);
58
+ const allowedValues = filled(field.allowedValues);
59
+ const shapeOf = (place)=>operators.find((option)=>option.place === place)?.shape ?? 'single';
60
+ const shape = shapeOf(operator);
48
61
  const [text = '', high = ''] = values;
49
62
  const listed = filled([
50
63
  ...allowedValues,
51
64
  ...entries
52
65
  ]);
53
66
  const offered = new Set(listed);
54
- const checked = filled(values).filter((value)=>offered.has(value));
67
+ const checked = filled(values).filter((candidate)=>offered.has(candidate));
55
68
  const withChecked = (option)=>{
56
69
  const next = filled([
57
70
  ...checked,
@@ -64,34 +77,49 @@ const useShapeDraft = (field, value, adds)=>{
64
77
  return next.sort((left, right)=>rank(left) - rank(right));
65
78
  };
66
79
  const typed = adding.trim();
67
- const byShape = {
68
- single: {
69
- kind: 'values',
70
- values: [
71
- text
72
- ],
73
- operator: picked
74
- },
75
- range: {
76
- kind: 'values',
77
- values: [
78
- text,
79
- high
80
- ],
81
- operator: picked,
82
- ends
83
- },
84
- list: {
85
- kind: 'values',
86
- values: typed ? withChecked(typed) : checked,
87
- operator: picked
80
+ const commitOf = (single)=>{
81
+ if ('outcome' === field.kind) return {
82
+ kind: 'outcome',
83
+ value: single
84
+ };
85
+ if ('expression' === field.kind || void 0 === operator) return {
86
+ kind: 'expression',
87
+ text: single
88
+ };
89
+ switch(shape){
90
+ case 'range':
91
+ return {
92
+ kind: 'range',
93
+ operator,
94
+ low: single,
95
+ high,
96
+ ends
97
+ };
98
+ case 'list':
99
+ return {
100
+ kind: 'list',
101
+ operator,
102
+ values: typed ? withChecked(typed) : checked
103
+ };
104
+ case 'valueless':
105
+ return {
106
+ kind: 'valueless',
107
+ operator
108
+ };
109
+ default:
110
+ return {
111
+ kind: 'single',
112
+ operator,
113
+ value: single
114
+ };
88
115
  }
89
116
  };
90
- const current = byShape[shape];
117
+ const current = commitOf(text);
91
118
  return {
92
- operators,
93
- operator,
94
- picked,
119
+ picker: void 0 === operator ? null : {
120
+ operators,
121
+ operator
122
+ },
95
123
  shape,
96
124
  values,
97
125
  text,
@@ -100,9 +128,12 @@ const useShapeDraft = (field, value, adds)=>{
100
128
  allowedValues,
101
129
  listed,
102
130
  checked,
131
+ heldList: 'condition' === field.kind && 'list' === field.held.shape ? field.held.values : [],
132
+ heldValueAt: (index)=>'condition' === field.kind ? opened[index] : opened[0],
103
133
  adding,
104
134
  current,
105
- problem: problemOf(shape, current, field, adds, held.length > 0 && allowedValues.length > 0),
135
+ commitOf,
136
+ problem: problemOf(current, adds, held.length > 0 && allowedValues.length > 0),
106
137
  setText: (next)=>setValues([
107
138
  next,
108
139
  ...values.slice(1)
@@ -125,13 +156,13 @@ const useShapeDraft = (field, value, adds)=>{
125
156
  setAdding('');
126
157
  },
127
158
  setAdding,
128
- changeOperator: (id)=>{
129
- if ('list' === shapeOf(id)) setEntries(filled([
159
+ changeOperator: (place)=>{
160
+ if ('list' === shapeOf(place)) setEntries(filled([
130
161
  ...entries,
131
162
  ...values
132
163
  ]));
133
- setOperator(id);
164
+ setOperator(place);
134
165
  }
135
166
  };
136
167
  };
137
- export { operatorOf, operatorsOf, useShapeDraft };
168
+ export { operatorsOf, useShapeDraft };
@@ -75,11 +75,7 @@ const useValueEditing = ({ edit, rules, bands, selected, onSelect, navigation, l
75
75
  if (!edit || !target || !rule) return null;
76
76
  const token = (0, external_sentenceParts_cjs_namespaceObject.valueTokenOf)(rule, target);
77
77
  const column = (0, external_sentenceParts_cjs_namespaceObject.columnNameOf)(rule, target.columnId) || (0, external_sentenceParts_cjs_namespaceObject.bandColumnNameOf)(bands, target.columnId);
78
- const hostField = edit.valueField?.(target);
79
- const field = {
80
- ...hostField,
81
- icon: hostField?.icon ?? (0, external_sentenceParts_cjs_namespaceObject.bandColumnOf)(bands, target.columnId)?.icon
82
- };
78
+ const field = edit.valueField(target);
83
79
  const held = (0, external_sentenceParts_cjs_namespaceObject.hasStop)(rule, target.columnId);
84
80
  const cancel = ()=>{
85
81
  awaitHost({
@@ -95,6 +91,7 @@ const useValueEditing = ({ edit, rules, bands, selected, onSelect, navigation, l
95
91
  value: token?.text ?? '',
96
92
  ariaLabel: held ? labels.cell(column, token ? (0, external_sentenceParts_cjs_namespaceObject.tokenText)(token, labels.emptyValue) : '', row + 1) : edit.labels.newCondition(column, row + 1),
97
93
  column,
94
+ icon: (0, external_sentenceParts_cjs_namespaceObject.bandColumnOf)(bands, target.columnId)?.icon,
98
95
  field,
99
96
  adds: !held,
100
97
  onCommit: (commit, move, refocus)=>{
@@ -173,8 +170,7 @@ const useValueEditing = ({ edit, rules, bands, selected, onSelect, navigation, l
173
170
  text: textIn(rules, selection),
174
171
  scroll
175
172
  };
176
- edit?.onClearCell(cell);
177
- cancelEditOf(selection);
173
+ if (edit?.onClearCell(cell) === void 0) cancelEditOf(selection);
178
174
  if (refocusNow && staysOn(cell.rowId)) navigation.refocus(scroll);
179
175
  };
180
176
  const onKeyDown = (event)=>{
@@ -1 +1 @@
1
- {"version":3,"file":"useValueEditing.d.ts","sourceRoot":"","sources":["../../src/decision-table/useValueEditing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAmBtD,OAAO,KAAK,EACV,YAAY,EAEZ,YAAY,EACZ,iBAAiB,EACjB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,QAAQ,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/C,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC/C,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC;IACpD,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;CACpC;AAqBD,MAAM,WAAW,YAAY;IAE3B,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IAE/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;IAEhE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;IAE3D,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B;AAUD,eAAO,MAAM,QAAQ,GAAI,4BAA4B,eAAe,KAAG,MAC7B,CAAC;AAc3C,eAAO,MAAM,eAAe,GAAI,4EAS7B,kBAAkB,KAAG,YA0LvB,CAAC"}
1
+ {"version":3,"file":"useValueEditing.d.ts","sourceRoot":"","sources":["../../src/decision-table/useValueEditing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAmBtD,OAAO,KAAK,EACV,YAAY,EAEZ,YAAY,EACZ,iBAAiB,EACjB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,QAAQ,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/C,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC/C,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC;IACpD,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;CACpC;AAqBD,MAAM,WAAW,YAAY;IAE3B,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IAE/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;IAEhE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;IAE3D,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B;AAUD,eAAO,MAAM,QAAQ,GAAI,4BAA4B,eAAe,KAAG,MAC7B,CAAC;AAc3C,eAAO,MAAM,eAAe,GAAI,4EAS7B,kBAAkB,KAAG,YAsLvB,CAAC"}
@@ -46,11 +46,7 @@ const useValueEditing = ({ edit, rules, bands, selected, onSelect, navigation, l
46
46
  if (!edit || !target || !rule) return null;
47
47
  const token = valueTokenOf(rule, target);
48
48
  const column = columnNameOf(rule, target.columnId) || bandColumnNameOf(bands, target.columnId);
49
- const hostField = edit.valueField?.(target);
50
- const field = {
51
- ...hostField,
52
- icon: hostField?.icon ?? bandColumnOf(bands, target.columnId)?.icon
53
- };
49
+ const field = edit.valueField(target);
54
50
  const held = hasStop(rule, target.columnId);
55
51
  const cancel = ()=>{
56
52
  awaitHost({
@@ -66,6 +62,7 @@ const useValueEditing = ({ edit, rules, bands, selected, onSelect, navigation, l
66
62
  value: token?.text ?? '',
67
63
  ariaLabel: held ? labels.cell(column, token ? tokenText(token, labels.emptyValue) : '', row + 1) : edit.labels.newCondition(column, row + 1),
68
64
  column,
65
+ icon: bandColumnOf(bands, target.columnId)?.icon,
69
66
  field,
70
67
  adds: !held,
71
68
  onCommit: (commit, move, refocus)=>{
@@ -144,8 +141,7 @@ const useValueEditing = ({ edit, rules, bands, selected, onSelect, navigation, l
144
141
  text: textIn(rules, selection),
145
142
  scroll
146
143
  };
147
- edit?.onClearCell(cell);
148
- cancelEditOf(selection);
144
+ if (edit?.onClearCell(cell) === void 0) cancelEditOf(selection);
149
145
  if (refocusNow && staysOn(cell.rowId)) navigation.refocus(scroll);
150
146
  };
151
147
  const onKeyDown = (event)=>{
@@ -1,6 +1,5 @@
1
1
  import type { GridCellEditorContext } from './gridTypes';
2
- import type { PopoverSelectOption } from './PopoverSelect';
3
- import type { SentenceBandColumn, SentenceValueId } from './sentenceTypes';
2
+ import type { SentenceValueId } from './sentenceTypes';
4
3
  export interface ExpressionEditorHandle {
5
4
  focus: () => void;
6
5
  ownsKeys?: () => boolean;
@@ -10,29 +9,68 @@ export interface ExpressionEditorProps extends Pick<GridCellEditorContext, 'valu
10
9
  onChange: (text: string) => void;
11
10
  onReady: (handle: ExpressionEditorHandle | null) => void;
12
11
  }
13
- export type ValueShape = 'single' | 'range' | 'list';
14
- export interface ValueOperatorOption extends PopoverSelectOption {
15
- shape?: ValueShape;
16
- }
17
12
  export interface RangeEnds {
18
13
  lowInclusive: boolean;
19
14
  highInclusive: boolean;
20
15
  }
21
- export interface ValueField {
22
- icon?: SentenceBandColumn['icon'];
23
- operators?: readonly ValueOperatorOption[];
24
- operator?: string;
25
- allowedValues?: readonly string[];
26
- values?: readonly string[];
27
- ends?: RangeEnds;
28
- inOrder?: (low: string, high: string) => boolean;
29
- expression?: string;
16
+ export type ValueShape = 'single' | 'range' | 'list' | 'valueless';
17
+ export interface OperatorOffer<Op> {
18
+ operator: Op;
19
+ label: string;
20
+ shape: ValueShape;
30
21
  }
31
- export type ValueCommit = {
32
- kind: 'values';
22
+ export type HeldValues<Op> = {
23
+ shape: 'single';
24
+ operator: Op;
25
+ value: string;
26
+ } | {
27
+ shape: 'range';
28
+ operator: Op;
29
+ low: string;
30
+ high: string;
31
+ ends: RangeEnds;
32
+ } | {
33
+ shape: 'list';
34
+ operator: Op;
35
+ values: readonly string[];
36
+ } | {
37
+ shape: 'valueless';
38
+ operator: Op;
39
+ };
40
+ export type ValueFieldData<Op> = {
41
+ kind: 'outcome';
42
+ allowedValues: readonly string[];
43
+ } | {
44
+ kind: 'expression';
45
+ allowedValues: readonly string[];
46
+ expression: string;
47
+ } | {
48
+ kind: 'condition';
49
+ allowedValues: readonly string[];
50
+ expression: string;
51
+ operators: readonly OperatorOffer<Op>[];
52
+ held: HeldValues<Op>;
53
+ };
54
+ export type ValueCommit<Op> = {
55
+ kind: 'outcome';
56
+ value: string;
57
+ } | {
58
+ kind: 'single';
59
+ operator: Op;
60
+ value: string;
61
+ } | {
62
+ kind: 'range';
63
+ operator: Op;
64
+ low: string;
65
+ high: string;
66
+ ends: RangeEnds;
67
+ } | {
68
+ kind: 'list';
69
+ operator: Op;
33
70
  values: readonly string[];
34
- operator: string | undefined;
35
- ends?: RangeEnds;
71
+ } | {
72
+ kind: 'valueless';
73
+ operator: Op;
36
74
  } | {
37
75
  kind: 'expression';
38
76
  text: string;
@@ -1 +1 @@
1
- {"version":3,"file":"valueTypes.d.ts","sourceRoot":"","sources":["../../src/decision-table/valueTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAG3E,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,IAAI,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;CAC1B;AAGD,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/F,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEjC,OAAO,EAAE,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,KAAK,IAAI,CAAC;CAC1D;AAGD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAGrD,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAGD,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,UAAU;IAEzB,IAAI,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAElC,SAAS,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAE3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAElC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAE3B,IAAI,CAAC,EAAE,SAAS,CAAC;IAEjB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAEjD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAGD,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,GAC7F;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAGzC,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB"}
1
+ {"version":3,"file":"valueTypes.d.ts","sourceRoot":"","sources":["../../src/decision-table/valueTypes.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uipath/apollo-react",
3
- "version": "7.26.0",
3
+ "version": "7.28.0",
4
4
  "description": "Apollo Design System - React component library with Material UI theming",
5
5
  "repository": {
6
6
  "type": "git",
@@ -252,9 +252,9 @@
252
252
  "zod": "^4.6.6",
253
253
  "zustand": "^5.0.9",
254
254
  "@uipath/apollo-ui-icons": "1.2.1",
255
- "@uipath/apollo-core": "5.15.2",
256
255
  "@uipath/apollo-ui-icons-react": "1.0.0",
257
- "@uipath/apollo-wind": "2.93.0"
256
+ "@uipath/apollo-wind": "2.93.0",
257
+ "@uipath/apollo-core": "5.15.2"
258
258
  },
259
259
  "devDependencies": {
260
260
  "@lingui/cli": "^5.6.1",