@uipath/apollo-react 7.20.0 → 7.21.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.
- package/dist/decision-table/ColumnPopover.cjs +7 -2
- package/dist/decision-table/ColumnPopover.d.ts +2 -1
- package/dist/decision-table/ColumnPopover.d.ts.map +1 -1
- package/dist/decision-table/ColumnPopover.js +7 -2
- package/dist/decision-table/DecisionText.cjs +13 -1
- package/dist/decision-table/DecisionText.d.ts +5 -8
- package/dist/decision-table/DecisionText.d.ts.map +1 -1
- package/dist/decision-table/DecisionText.js +14 -2
- package/dist/decision-table/EditorOverlay.cjs +5 -1
- package/dist/decision-table/EditorOverlay.d.ts.map +1 -1
- package/dist/decision-table/EditorOverlay.js +5 -1
- package/dist/decision-table/ExpressionEditorFrame.cjs +2 -2
- package/dist/decision-table/ExpressionEditorFrame.js +2 -2
- package/dist/decision-table/MarkTooltip.cjs +58 -14
- package/dist/decision-table/MarkTooltip.d.ts.map +1 -1
- package/dist/decision-table/MarkTooltip.js +58 -14
- package/dist/decision-table/PopoverSelect.cjs +2 -1
- package/dist/decision-table/PopoverSelect.d.ts.map +1 -1
- package/dist/decision-table/PopoverSelect.js +2 -1
- package/dist/decision-table/TokenChip.d.ts +1 -1
- package/dist/decision-table/TokenChip.d.ts.map +1 -1
- package/dist/decision-table/ValueEditorOverlay.cjs +2 -1
- package/dist/decision-table/ValueEditorOverlay.d.ts +2 -2
- package/dist/decision-table/ValueEditorOverlay.d.ts.map +1 -1
- package/dist/decision-table/ValueEditorOverlay.js +2 -1
- package/dist/decision-table/ValuePopover.cjs +14 -3
- package/dist/decision-table/ValuePopover.d.ts +2 -1
- package/dist/decision-table/ValuePopover.d.ts.map +1 -1
- package/dist/decision-table/ValuePopover.js +14 -3
- package/dist/decision-table/__fixtures__/editableSentences.fixtures.d.ts +5 -5
- package/dist/decision-table/__fixtures__/editableSentences.fixtures.d.ts.map +1 -1
- package/dist/decision-table/__fixtures__/modalDialog.d.ts +1 -0
- package/dist/decision-table/__fixtures__/modalDialog.d.ts.map +1 -1
- package/dist/decision-table/__fixtures__/sentences.fixtures.d.ts +7 -15
- package/dist/decision-table/__fixtures__/sentences.fixtures.d.ts.map +1 -1
- package/dist/decision-table/bandColumns.cjs +68 -0
- package/dist/decision-table/bandColumns.d.ts +9 -0
- package/dist/decision-table/bandColumns.d.ts.map +1 -0
- package/dist/decision-table/bandColumns.js +31 -0
- package/dist/decision-table/decisionTextTypes.d.ts +16 -11
- package/dist/decision-table/decisionTextTypes.d.ts.map +1 -1
- package/dist/decision-table/index.d.ts +3 -3
- package/dist/decision-table/index.d.ts.map +1 -1
- package/dist/decision-table/locales/de.cjs +1 -1
- package/dist/decision-table/locales/de.d.ts.map +1 -1
- package/dist/decision-table/locales/de.js +1 -1
- package/dist/decision-table/locales/en.cjs +1 -1
- package/dist/decision-table/locales/en.d.ts.map +1 -1
- package/dist/decision-table/locales/en.js +1 -1
- package/dist/decision-table/locales/es-MX.cjs +1 -1
- package/dist/decision-table/locales/es-MX.d.ts.map +1 -1
- package/dist/decision-table/locales/es-MX.js +1 -1
- package/dist/decision-table/locales/es.cjs +1 -1
- package/dist/decision-table/locales/es.d.ts.map +1 -1
- package/dist/decision-table/locales/es.js +1 -1
- package/dist/decision-table/locales/fr.cjs +1 -1
- package/dist/decision-table/locales/fr.d.ts.map +1 -1
- package/dist/decision-table/locales/fr.js +1 -1
- package/dist/decision-table/locales/ja.cjs +1 -1
- package/dist/decision-table/locales/ja.d.ts.map +1 -1
- package/dist/decision-table/locales/ja.js +1 -1
- package/dist/decision-table/locales/ko.cjs +1 -1
- package/dist/decision-table/locales/ko.d.ts.map +1 -1
- package/dist/decision-table/locales/ko.js +1 -1
- package/dist/decision-table/locales/pt-BR.cjs +1 -1
- package/dist/decision-table/locales/pt-BR.d.ts.map +1 -1
- package/dist/decision-table/locales/pt-BR.js +1 -1
- package/dist/decision-table/locales/pt.cjs +1 -1
- package/dist/decision-table/locales/pt.d.ts.map +1 -1
- package/dist/decision-table/locales/pt.js +1 -1
- package/dist/decision-table/locales/ro.cjs +1 -1
- package/dist/decision-table/locales/ro.d.ts.map +1 -1
- package/dist/decision-table/locales/ro.js +1 -1
- package/dist/decision-table/locales/ru.cjs +1 -1
- package/dist/decision-table/locales/ru.d.ts.map +1 -1
- package/dist/decision-table/locales/ru.js +1 -1
- package/dist/decision-table/locales/tr.cjs +1 -1
- package/dist/decision-table/locales/tr.d.ts.map +1 -1
- package/dist/decision-table/locales/tr.js +1 -1
- package/dist/decision-table/locales/zh-CN.cjs +1 -1
- package/dist/decision-table/locales/zh-CN.d.ts.map +1 -1
- package/dist/decision-table/locales/zh-CN.js +1 -1
- package/dist/decision-table/locales/zh-TW.cjs +1 -1
- package/dist/decision-table/locales/zh-TW.d.ts.map +1 -1
- package/dist/decision-table/locales/zh-TW.js +1 -1
- package/dist/decision-table/ruleCardModel.cjs +4 -11
- package/dist/decision-table/ruleCardModel.d.ts +3 -4
- package/dist/decision-table/ruleCardModel.d.ts.map +1 -1
- package/dist/decision-table/ruleCardModel.js +5 -9
- package/dist/decision-table/ruleMenuEntries.cjs +138 -0
- package/dist/decision-table/ruleMenuEntries.d.ts +25 -0
- package/dist/decision-table/ruleMenuEntries.d.ts.map +1 -0
- package/dist/decision-table/ruleMenuEntries.js +101 -0
- package/dist/decision-table/sentenceParts.cjs +10 -6
- package/dist/decision-table/sentenceParts.d.ts +1 -0
- package/dist/decision-table/sentenceParts.d.ts.map +1 -1
- package/dist/decision-table/sentenceParts.js +3 -2
- package/dist/decision-table/sentenceTypes.d.ts +3 -1
- package/dist/decision-table/sentenceTypes.d.ts.map +1 -1
- package/dist/decision-table/useColumnEditing.cjs +11 -1
- package/dist/decision-table/useColumnEditing.d.ts.map +1 -1
- package/dist/decision-table/useColumnEditing.js +12 -2
- package/dist/decision-table/useDecisionTextStrings.cjs +326 -0
- package/dist/decision-table/useDecisionTextStrings.d.ts +5 -0
- package/dist/decision-table/useDecisionTextStrings.d.ts.map +1 -0
- package/dist/decision-table/useDecisionTextStrings.js +286 -0
- package/dist/decision-table/useEditState.cjs +87 -0
- package/dist/decision-table/useEditState.d.ts +8 -0
- package/dist/decision-table/useEditState.d.ts.map +1 -0
- package/dist/decision-table/useEditState.js +53 -0
- package/dist/decision-table/useEditorPlacement.cjs +15 -3
- package/dist/decision-table/useEditorPlacement.d.ts.map +1 -1
- package/dist/decision-table/useEditorPlacement.js +15 -3
- package/dist/decision-table/usePendingCondition.d.ts +2 -2
- package/dist/decision-table/usePendingCondition.d.ts.map +1 -1
- package/dist/decision-table/useRuleMenus.cjs +9 -6
- package/dist/decision-table/useRuleMenus.d.ts +5 -4
- package/dist/decision-table/useRuleMenus.d.ts.map +1 -1
- package/dist/decision-table/useRuleMenus.js +9 -6
- package/dist/decision-table/useShapeDraft.cjs +3 -4
- package/dist/decision-table/useShapeDraft.d.ts.map +1 -1
- package/dist/decision-table/useShapeDraft.js +3 -4
- package/dist/decision-table/useValueEditing.cjs +8 -4
- package/dist/decision-table/useValueEditing.d.ts +3 -3
- package/dist/decision-table/useValueEditing.d.ts.map +1 -1
- package/dist/decision-table/useValueEditing.js +9 -5
- package/dist/decision-table/valueTypes.d.ts +6 -1
- package/dist/decision-table/valueTypes.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -30,6 +30,7 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
30
30
|
const jsx_runtime_namespaceObject = require("react/jsx-runtime");
|
|
31
31
|
const apollo_wind_namespaceObject = require("@uipath/apollo-wind");
|
|
32
32
|
const external_react_namespaceObject = require("react");
|
|
33
|
+
const external_bandColumns_cjs_namespaceObject = require("./bandColumns.cjs");
|
|
33
34
|
const external_gridEvents_cjs_namespaceObject = require("./gridEvents.cjs");
|
|
34
35
|
const external_PopoverFooter_cjs_namespaceObject = require("./PopoverFooter.cjs");
|
|
35
36
|
const external_PopoverHeader_cjs_namespaceObject = require("./PopoverHeader.cjs");
|
|
@@ -55,12 +56,16 @@ const ColumnPopover = ({ column, field, types, onApply, onCancel, onMoreProperti
|
|
|
55
56
|
});
|
|
56
57
|
const missing = field.required && '' === draft.binding.trim();
|
|
57
58
|
const missingLabel = '' === draft.label.trim();
|
|
58
|
-
const
|
|
59
|
+
const typed = types.map((type)=>({
|
|
60
|
+
...type,
|
|
61
|
+
icon: type.icon ?? (0, external_bandColumns_cjs_namespaceObject.valueTypeIcon)(type.type)
|
|
62
|
+
}));
|
|
63
|
+
const options = types.some((type)=>type.id === field.typeRef) ? typed : [
|
|
59
64
|
{
|
|
60
65
|
id: field.typeRef,
|
|
61
66
|
label: field.typeRef
|
|
62
67
|
},
|
|
63
|
-
...
|
|
68
|
+
...typed
|
|
64
69
|
];
|
|
65
70
|
const placeholder = types.find((type)=>type.id === draft.typeRef)?.allowedValuesPlaceholder;
|
|
66
71
|
const set = (key)=>(event)=>{
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type React from 'react';
|
|
2
2
|
import { type PopoverFooterLabels } from './PopoverFooter';
|
|
3
3
|
import { type PopoverSelectOption } from './PopoverSelect';
|
|
4
|
-
import type { SentenceBand, SentenceNameToken } from './sentenceTypes';
|
|
4
|
+
import type { SentenceBand, SentenceNameToken, SentenceValueType } from './sentenceTypes';
|
|
5
5
|
export interface ColumnField {
|
|
6
6
|
kind: SentenceNameToken['kind'];
|
|
7
7
|
label: string;
|
|
@@ -12,6 +12,7 @@ export interface ColumnField {
|
|
|
12
12
|
}
|
|
13
13
|
export type ColumnChange = Partial<Pick<ColumnField, 'label' | 'binding' | 'typeRef' | 'allowedValues'>>;
|
|
14
14
|
export interface ColumnTypeOption extends PopoverSelectOption {
|
|
15
|
+
type?: SentenceValueType;
|
|
15
16
|
allowedValuesPlaceholder?: string;
|
|
16
17
|
}
|
|
17
18
|
export interface ColumnEdit {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnPopover.d.ts","sourceRoot":"","sources":["../../src/decision-table/ColumnPopover.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ColumnPopover.d.ts","sourceRoot":"","sources":["../../src/decision-table/ColumnPopover.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAiB,KAAK,mBAAmB,EAA0B,MAAM,iBAAiB,CAAC;AAElG,OAAO,EAAiB,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAW1E,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAG1F,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IAEd,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,EAAE,OAAO,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAGD,MAAM,MAAM,YAAY,GAAG,OAAO,CAChC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,eAAe,CAAC,CACrE,CAAC;AAGF,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAE3D,IAAI,CAAC,EAAE,iBAAiB,CAAC;IAEzB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAGD,MAAM,WAAW,UAAU;IAEzB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,WAAW,CAAC;IACzC,KAAK,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAEnC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;IAE3D,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/C;AAGD,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAE9D,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACtC,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;IACxC,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,gBAAgB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3C,MAAM,EAAE,mBAAmB,CAAC;IAE5B,UAAU,EAAE,MAAM,CAAC;CACpB;AAGD,eAAO,MAAM,WAAW,GACtB,MAAM,WAAW,CAAC,MAAM,CAAC,EACzB,MAAM,MAAM,EACZ,QAAQ,mBAAmB,KAC1B,MAAmF,CAAC;AAiBvF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgJtD,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { Input, Label } from "@uipath/apollo-wind";
|
|
3
3
|
import { useId, useState } from "react";
|
|
4
|
+
import { valueTypeIcon } from "./bandColumns.js";
|
|
4
5
|
import { isComposing } from "./gridEvents.js";
|
|
5
6
|
import { PopoverFooter } from "./PopoverFooter.js";
|
|
6
7
|
import { PopoverHeader } from "./PopoverHeader.js";
|
|
@@ -26,12 +27,16 @@ const ColumnPopover = ({ column, field, types, onApply, onCancel, onMoreProperti
|
|
|
26
27
|
});
|
|
27
28
|
const missing = field.required && '' === draft.binding.trim();
|
|
28
29
|
const missingLabel = '' === draft.label.trim();
|
|
29
|
-
const
|
|
30
|
+
const typed = types.map((type)=>({
|
|
31
|
+
...type,
|
|
32
|
+
icon: type.icon ?? valueTypeIcon(type.type)
|
|
33
|
+
}));
|
|
34
|
+
const options = types.some((type)=>type.id === field.typeRef) ? typed : [
|
|
30
35
|
{
|
|
31
36
|
id: field.typeRef,
|
|
32
37
|
label: field.typeRef
|
|
33
38
|
},
|
|
34
|
-
...
|
|
39
|
+
...typed
|
|
35
40
|
];
|
|
36
41
|
const placeholder = types.find((type)=>type.id === draft.typeRef)?.allowedValuesPlaceholder;
|
|
37
42
|
const set = (key)=>(event)=>{
|
|
@@ -30,6 +30,7 @@ const jsx_runtime_namespaceObject = require("react/jsx-runtime");
|
|
|
30
30
|
const apollo_wind_namespaceObject = require("@uipath/apollo-wind");
|
|
31
31
|
const external_react_namespaceObject = require("react");
|
|
32
32
|
const external_AddRuleFooter_cjs_namespaceObject = require("./AddRuleFooter.cjs");
|
|
33
|
+
const external_bandColumns_cjs_namespaceObject = require("./bandColumns.cjs");
|
|
33
34
|
const external_ColumnEditorOverlay_cjs_namespaceObject = require("./ColumnEditorOverlay.cjs");
|
|
34
35
|
const external_DecisionTextHeader_cjs_namespaceObject = require("./DecisionTextHeader.cjs");
|
|
35
36
|
const external_EmptyRules_cjs_namespaceObject = require("./EmptyRules.cjs");
|
|
@@ -45,14 +46,23 @@ const external_useAddRule_cjs_namespaceObject = require("./useAddRule.cjs");
|
|
|
45
46
|
const external_useCellHover_cjs_namespaceObject = require("./useCellHover.cjs");
|
|
46
47
|
const external_useColumnEditing_cjs_namespaceObject = require("./useColumnEditing.cjs");
|
|
47
48
|
const external_useContainerHandlers_cjs_namespaceObject = require("./useContainerHandlers.cjs");
|
|
49
|
+
const external_useDecisionTextStrings_cjs_namespaceObject = require("./useDecisionTextStrings.cjs");
|
|
50
|
+
const external_useEditState_cjs_namespaceObject = require("./useEditState.cjs");
|
|
48
51
|
const external_usePendingCondition_cjs_namespaceObject = require("./usePendingCondition.cjs");
|
|
49
52
|
const external_useRuleMenus_cjs_namespaceObject = require("./useRuleMenus.cjs");
|
|
50
53
|
const external_useRuleWindow_cjs_namespaceObject = require("./useRuleWindow.cjs");
|
|
51
54
|
const external_useSentenceNavigation_cjs_namespaceObject = require("./useSentenceNavigation.cjs");
|
|
52
55
|
const external_useValueEditing_cjs_namespaceObject = require("./useValueEditing.cjs");
|
|
53
56
|
const external_ValueEditorOverlay_cjs_namespaceObject = require("./ValueEditorOverlay.cjs");
|
|
54
|
-
const DecisionText = ({ rules,
|
|
57
|
+
const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks = external_marks_cjs_namespaceObject.EMPTY_MARKS, addRule, onCellHover, selected, onSelect, edit: hostEdit, policy, headerMark, onOpenDecision, labels: hostLabels, ariaLabel, containerProps, dataTestId, children })=>{
|
|
55
58
|
const idPrefix = (0, external_react_namespaceObject.useId)();
|
|
59
|
+
const labels = (0, external_useDecisionTextStrings_cjs_namespaceObject.useDecisionTextLabels)(hostLabels);
|
|
60
|
+
const { edit, refusal } = (0, external_useEditState_cjs_namespaceObject.useEditState)(hostEdit, (0, external_useDecisionTextStrings_cjs_namespaceObject.useDecisionTextEditLabels)(hostEdit?.labels));
|
|
61
|
+
const bands = (0, external_react_namespaceObject.useMemo)(()=>(0, external_bandColumns_cjs_namespaceObject.bandsOf)(inputs, outputs, labels), [
|
|
62
|
+
inputs,
|
|
63
|
+
outputs,
|
|
64
|
+
labels
|
|
65
|
+
]);
|
|
56
66
|
const { rows: rowMarks, columns: bandMarks } = (0, external_sentenceMarks_cjs_namespaceObject.tableMarks)(marks);
|
|
57
67
|
const hoverTo = (0, external_useCellHover_cjs_namespaceObject.useCellHover)(onCellHover);
|
|
58
68
|
const shown = (0, external_usePendingCondition_cjs_namespaceObject.usePendingCondition)({
|
|
@@ -76,6 +86,7 @@ const DecisionText = ({ rules, bands, header, numbered = false, marks = external
|
|
|
76
86
|
const ruleMenus = (0, external_useRuleMenus_cjs_namespaceObject.useRuleMenus)({
|
|
77
87
|
edit,
|
|
78
88
|
rules,
|
|
89
|
+
bands,
|
|
79
90
|
selectedRowId: selected?.rowId,
|
|
80
91
|
refocus: navigation.refocus
|
|
81
92
|
});
|
|
@@ -162,6 +173,7 @@ const DecisionText = ({ rules, bands, header, numbered = false, marks = external
|
|
|
162
173
|
editor: valueEditing.editor,
|
|
163
174
|
renderEditor: edit.renderEditor,
|
|
164
175
|
labels: edit.labels,
|
|
176
|
+
refusal: refusal,
|
|
165
177
|
onOperatorChange: shown.onOperatorChange,
|
|
166
178
|
container: ruleWindow.container,
|
|
167
179
|
dataTestId: dataTestId
|
|
@@ -1,19 +1,16 @@
|
|
|
1
1
|
import type React from 'react';
|
|
2
2
|
import type { AddRuleButtonProps } from './AddRuleButton';
|
|
3
3
|
import { type DecisionTextHeaderProps } from './DecisionTextHeader';
|
|
4
|
-
import type { DecisionTextEdit } from './decisionTextTypes';
|
|
4
|
+
import type { DecisionTextEdit, DecisionTextLabels } from './decisionTextTypes';
|
|
5
5
|
import { type TableMarks } from './marks';
|
|
6
|
-
import type {
|
|
7
|
-
import type { SentenceBand, SentenceHeader, SentenceRule, SentenceSelection } from './sentenceTypes';
|
|
6
|
+
import type { SentenceBandColumn, SentenceHeader, SentenceRule, SentenceSelection } from './sentenceTypes';
|
|
8
7
|
import { useCellHover } from './useCellHover';
|
|
9
8
|
import { type ContainerHandlersParams, type DecisionTextContainerProps } from './useContainerHandlers';
|
|
10
9
|
import { type SentenceNavigationSource } from './useSentenceNavigation';
|
|
11
|
-
export interface DecisionTextLabels extends RuleCardLabels {
|
|
12
|
-
emptyRules: string;
|
|
13
|
-
}
|
|
14
10
|
interface DecisionTextBaseProps {
|
|
15
11
|
rules: readonly SentenceRule[];
|
|
16
|
-
|
|
12
|
+
inputs: readonly SentenceBandColumn[];
|
|
13
|
+
outputs: readonly SentenceBandColumn[];
|
|
17
14
|
header: SentenceHeader;
|
|
18
15
|
numbered?: boolean;
|
|
19
16
|
marks?: TableMarks;
|
|
@@ -22,7 +19,7 @@ interface DecisionTextBaseProps {
|
|
|
22
19
|
policy?: DecisionTextHeaderProps['policy'];
|
|
23
20
|
headerMark?: DecisionTextHeaderProps['mark'];
|
|
24
21
|
onOpenDecision?: ContainerHandlersParams['onOpenDecision'];
|
|
25
|
-
labels
|
|
22
|
+
labels?: Partial<DecisionTextLabels>;
|
|
26
23
|
ariaLabel: string;
|
|
27
24
|
containerProps?: DecisionTextContainerProps;
|
|
28
25
|
dataTestId: string;
|
|
@@ -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;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"DecisionText.d.ts","sourceRoot":"","sources":["../../src/decision-table/DecisionText.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAI1D,OAAO,EAAsB,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAIhF,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAMvD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACd,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;AAMhC,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,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAE7B,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,CAAC,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAE3C,UAAU,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAE7C,cAAc,CAAC,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAE3D,MAAM,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAErC,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,UAAU,oBAAoB;IAE5B,QAAQ,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAGD,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAEnC,QAAQ,EAAE,WAAW,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,MAAM,iBAAiB,GAAG,qBAAqB,GACnD,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,CAAC;AAGhD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA+JpD,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { cn } from "@uipath/apollo-wind";
|
|
3
|
-
import { useId } from "react";
|
|
3
|
+
import { useId, useMemo } from "react";
|
|
4
4
|
import { AddRuleFooter } from "./AddRuleFooter.js";
|
|
5
|
+
import { bandsOf } from "./bandColumns.js";
|
|
5
6
|
import { ColumnEditorOverlay } from "./ColumnEditorOverlay.js";
|
|
6
7
|
import { DecisionTextHeader } from "./DecisionTextHeader.js";
|
|
7
8
|
import { EmptyRules } from "./EmptyRules.js";
|
|
@@ -17,14 +18,23 @@ import { useAddRule } from "./useAddRule.js";
|
|
|
17
18
|
import { useCellHover } from "./useCellHover.js";
|
|
18
19
|
import { useColumnEditing } from "./useColumnEditing.js";
|
|
19
20
|
import { useContainerHandlers } from "./useContainerHandlers.js";
|
|
21
|
+
import { useDecisionTextEditLabels, useDecisionTextLabels } from "./useDecisionTextStrings.js";
|
|
22
|
+
import { useEditState } from "./useEditState.js";
|
|
20
23
|
import { usePendingCondition } from "./usePendingCondition.js";
|
|
21
24
|
import { useRuleMenus } from "./useRuleMenus.js";
|
|
22
25
|
import { useRuleWindow } from "./useRuleWindow.js";
|
|
23
26
|
import { useSentenceNavigation } from "./useSentenceNavigation.js";
|
|
24
27
|
import { useValueEditing } from "./useValueEditing.js";
|
|
25
28
|
import { ValueEditorOverlay } from "./ValueEditorOverlay.js";
|
|
26
|
-
const DecisionText = ({ rules,
|
|
29
|
+
const DecisionText = ({ rules, inputs, outputs, header, numbered = false, marks = EMPTY_MARKS, addRule, onCellHover, selected, onSelect, edit: hostEdit, policy, headerMark, onOpenDecision, labels: hostLabels, ariaLabel, containerProps, dataTestId, children })=>{
|
|
27
30
|
const idPrefix = useId();
|
|
31
|
+
const labels = useDecisionTextLabels(hostLabels);
|
|
32
|
+
const { edit, refusal } = useEditState(hostEdit, useDecisionTextEditLabels(hostEdit?.labels));
|
|
33
|
+
const bands = useMemo(()=>bandsOf(inputs, outputs, labels), [
|
|
34
|
+
inputs,
|
|
35
|
+
outputs,
|
|
36
|
+
labels
|
|
37
|
+
]);
|
|
28
38
|
const { rows: rowMarks, columns: bandMarks } = tableMarks(marks);
|
|
29
39
|
const hoverTo = useCellHover(onCellHover);
|
|
30
40
|
const shown = usePendingCondition({
|
|
@@ -48,6 +58,7 @@ const DecisionText = ({ rules, bands, header, numbered = false, marks = EMPTY_MA
|
|
|
48
58
|
const ruleMenus = useRuleMenus({
|
|
49
59
|
edit,
|
|
50
60
|
rules,
|
|
61
|
+
bands,
|
|
51
62
|
selectedRowId: selected?.rowId,
|
|
52
63
|
refocus: navigation.refocus
|
|
53
64
|
});
|
|
@@ -134,6 +145,7 @@ const DecisionText = ({ rules, bands, header, numbered = false, marks = EMPTY_MA
|
|
|
134
145
|
editor: valueEditing.editor,
|
|
135
146
|
renderEditor: edit.renderEditor,
|
|
136
147
|
labels: edit.labels,
|
|
148
|
+
refusal: refusal,
|
|
137
149
|
onOperatorChange: shown.onOperatorChange,
|
|
138
150
|
container: ruleWindow.container,
|
|
139
151
|
dataTestId: dataTestId
|
|
@@ -40,6 +40,8 @@ const UNPLACED = {
|
|
|
40
40
|
const overlayStyle = ({ top, left })=>({
|
|
41
41
|
top,
|
|
42
42
|
left,
|
|
43
|
+
right: 'auto',
|
|
44
|
+
bottom: 'auto',
|
|
43
45
|
'--grid-row-height': `${external_constants_cjs_namespaceObject.BODY_ROW_HEIGHT_PX}px`
|
|
44
46
|
});
|
|
45
47
|
const onBackdrop = (event)=>{
|
|
@@ -117,9 +119,11 @@ const EditorOverlay = ({ anchor, container, ariaLabel, className, id, dataTestId
|
|
|
117
119
|
},
|
|
118
120
|
onAuxClick: takePress,
|
|
119
121
|
onContextMenu: takePress,
|
|
122
|
+
onKeyDownCapture: (event)=>{
|
|
123
|
+
if ('Escape' === event.key && (0, external_gridEvents_cjs_namespaceObject.isComposing)(event)) event.preventDefault();
|
|
124
|
+
},
|
|
120
125
|
onKeyDown: (event)=>{
|
|
121
126
|
const { currentTarget, target, shiftKey } = event;
|
|
122
|
-
if ('Escape' === event.key && (0, external_gridEvents_cjs_namespaceObject.isComposing)(event)) event.preventDefault();
|
|
123
127
|
if (event.defaultPrevented || !isPlainTab(event)) return;
|
|
124
128
|
if (!shiftKey && target === (0, external_PopoverFooter_cjs_namespaceObject.lastActionIn)(currentTarget)) {
|
|
125
129
|
wrappingRef.current = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditorOverlay.d.ts","sourceRoot":"","sources":["../../src/decision-table/EditorOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,EAAE,KAAK,YAAY,EAA4C,MAAM,sBAAsB,CAAC;AACnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"EditorOverlay.d.ts","sourceRoot":"","sources":["../../src/decision-table/EditorOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,EAAE,KAAK,YAAY,EAA4C,MAAM,sBAAsB,CAAC;AACnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAiClD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IAEnB,cAAc,EAAE,MAAM,IAAI,CAAC;IAE3B,QAAQ,EAAE,MAAM,IAAI,CAAC;IAErB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAGD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoGtD,CAAC"}
|
|
@@ -12,6 +12,8 @@ const UNPLACED = {
|
|
|
12
12
|
const overlayStyle = ({ top, left })=>({
|
|
13
13
|
top,
|
|
14
14
|
left,
|
|
15
|
+
right: 'auto',
|
|
16
|
+
bottom: 'auto',
|
|
15
17
|
'--grid-row-height': `${BODY_ROW_HEIGHT_PX}px`
|
|
16
18
|
});
|
|
17
19
|
const onBackdrop = (event)=>{
|
|
@@ -89,9 +91,11 @@ const EditorOverlay = ({ anchor, container, ariaLabel, className, id, dataTestId
|
|
|
89
91
|
},
|
|
90
92
|
onAuxClick: takePress,
|
|
91
93
|
onContextMenu: takePress,
|
|
94
|
+
onKeyDownCapture: (event)=>{
|
|
95
|
+
if ('Escape' === event.key && isComposing(event)) event.preventDefault();
|
|
96
|
+
},
|
|
92
97
|
onKeyDown: (event)=>{
|
|
93
98
|
const { currentTarget, target, shiftKey } = event;
|
|
94
|
-
if ('Escape' === event.key && isComposing(event)) event.preventDefault();
|
|
95
99
|
if (event.defaultPrevented || !isPlainTab(event)) return;
|
|
96
100
|
if (!shiftKey && target === lastActionIn(currentTarget)) {
|
|
97
101
|
wrappingRef.current = true;
|
|
@@ -51,10 +51,10 @@ const ExpressionEditorFrame = ({ renderEditor, onApply, onCancel, dataTestId, ..
|
|
|
51
51
|
(handleRef.current ?? frameRef.current)?.focus();
|
|
52
52
|
}, []);
|
|
53
53
|
const onKeyDownCapture = (event)=>{
|
|
54
|
-
if (!FRAME_KEYS.has(event.key)) return;
|
|
54
|
+
if (!FRAME_KEYS.has(event.key) || (0, external_gridEvents_cjs_namespaceObject.isComposing)(event)) return;
|
|
55
55
|
if (!isShiftTab(event) && handleRef.current?.ownsKeys?.()) return;
|
|
56
56
|
event.stopPropagation();
|
|
57
|
-
if (
|
|
57
|
+
if ('Tab' === event.key) return;
|
|
58
58
|
event.preventDefault();
|
|
59
59
|
if ('Escape' === event.key) onCancel();
|
|
60
60
|
else onApply();
|
|
@@ -23,10 +23,10 @@ const ExpressionEditorFrame = ({ renderEditor, onApply, onCancel, dataTestId, ..
|
|
|
23
23
|
(handleRef.current ?? frameRef.current)?.focus();
|
|
24
24
|
}, []);
|
|
25
25
|
const onKeyDownCapture = (event)=>{
|
|
26
|
-
if (!FRAME_KEYS.has(event.key)) return;
|
|
26
|
+
if (!FRAME_KEYS.has(event.key) || isComposing(event)) return;
|
|
27
27
|
if (!isShiftTab(event) && handleRef.current?.ownsKeys?.()) return;
|
|
28
28
|
event.stopPropagation();
|
|
29
|
-
if (
|
|
29
|
+
if ('Tab' === event.key) return;
|
|
30
30
|
event.preventDefault();
|
|
31
31
|
if ('Escape' === event.key) onCancel();
|
|
32
32
|
else onApply();
|
|
@@ -48,26 +48,37 @@ const markedFor = (target)=>{
|
|
|
48
48
|
const titlesOf = (badges)=>[
|
|
49
49
|
...new Set(badges.flatMap((badge)=>badge.dataset.markTitle?.split('\n') ?? []))
|
|
50
50
|
].join('\n');
|
|
51
|
+
const focusedMarkOf = (target)=>{
|
|
52
|
+
const badges = markedFor(target);
|
|
53
|
+
const [element] = badges;
|
|
54
|
+
return element ? {
|
|
55
|
+
element,
|
|
56
|
+
title: titlesOf(badges)
|
|
57
|
+
} : null;
|
|
58
|
+
};
|
|
59
|
+
const isMarked = (element)=>element?.isConnected === true && element.matches(MARKED);
|
|
60
|
+
const sameShown = (a, b)=>a.title === b.title && a.rect.top === b.rect.top && a.rect.left === b.rect.left && a.rect.width === b.rect.width && a.rect.height === b.rect.height;
|
|
51
61
|
const MarkTooltip = ({ container, dataTestId })=>{
|
|
52
62
|
const [shown, setShown] = (0, external_react_namespaceObject.useState)(null);
|
|
53
63
|
(0, external_react_namespaceObject.useEffect)(()=>{
|
|
54
64
|
const section = container();
|
|
55
65
|
if (!section) return;
|
|
56
66
|
let current = null;
|
|
57
|
-
let
|
|
67
|
+
let pointed = null;
|
|
58
68
|
let hovered = null;
|
|
69
|
+
let focusTarget = null;
|
|
59
70
|
let focused = null;
|
|
60
71
|
let dismissed = false;
|
|
72
|
+
let byFocus = false;
|
|
61
73
|
let hideTimer;
|
|
62
74
|
const show = (element, title = element?.dataset.markTitle)=>{
|
|
63
75
|
clearTimeout(hideTimer);
|
|
64
|
-
if (element === current &&
|
|
76
|
+
if (element === current && dismissed) return;
|
|
65
77
|
current = element;
|
|
66
|
-
currentTitle = title;
|
|
67
78
|
dismissed = false;
|
|
68
79
|
if (!element || !title) return void setShown(null);
|
|
69
80
|
const { top, left, width, height } = element.getBoundingClientRect();
|
|
70
|
-
|
|
81
|
+
const next = {
|
|
71
82
|
rect: {
|
|
72
83
|
top,
|
|
73
84
|
left,
|
|
@@ -75,39 +86,64 @@ const MarkTooltip = ({ container, dataTestId })=>{
|
|
|
75
86
|
height
|
|
76
87
|
},
|
|
77
88
|
title
|
|
78
|
-
}
|
|
89
|
+
};
|
|
90
|
+
setShown((was)=>was && sameShown(was, next) ? was : next);
|
|
79
91
|
};
|
|
80
92
|
const hide = ()=>show(null);
|
|
81
|
-
const showFocused = ()=>
|
|
93
|
+
const showFocused = ()=>{
|
|
94
|
+
byFocus = true;
|
|
95
|
+
show(focused?.element ?? null, focused?.title);
|
|
96
|
+
};
|
|
82
97
|
const onPointerOver = (event)=>{
|
|
83
98
|
const marked = markedAt(event.target);
|
|
99
|
+
pointed = event.target instanceof Element ? event.target : null;
|
|
84
100
|
hovered = marked;
|
|
85
101
|
clearTimeout(hideTimer);
|
|
102
|
+
if (marked) byFocus = false;
|
|
86
103
|
if (marked || !current) show(marked);
|
|
87
104
|
else if (current !== focused?.element && !isOnTooltip(event.target)) hideTimer = setTimeout(showFocused, HIDE_DELAY_MS);
|
|
88
105
|
};
|
|
89
106
|
const onFocusIn = (event)=>{
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
focused = element ? {
|
|
93
|
-
element,
|
|
94
|
-
title: titlesOf(badges)
|
|
95
|
-
} : null;
|
|
107
|
+
focusTarget = event.target instanceof Element ? event.target : null;
|
|
108
|
+
focused = focusedMarkOf(focusTarget);
|
|
96
109
|
if (focused || !hovered) showFocused();
|
|
97
110
|
};
|
|
111
|
+
const onMarksChange = ()=>{
|
|
112
|
+
hovered = pointed?.isConnected ? markedAt(pointed) : null;
|
|
113
|
+
const was = focused?.element;
|
|
114
|
+
if (focusTarget) focused = focusTarget.isConnected ? focusedMarkOf(focusTarget) : null;
|
|
115
|
+
if (byFocus && focused) showFocused();
|
|
116
|
+
else if (hovered) show(hovered);
|
|
117
|
+
else if (null === current ? null === focusTarget : current !== was && isMarked(current)) {
|
|
118
|
+
if (isOnTooltip(pointed)) show(current);
|
|
119
|
+
} else showFocused();
|
|
120
|
+
};
|
|
121
|
+
const observer = new MutationObserver(onMarksChange);
|
|
122
|
+
observer.observe(section, {
|
|
123
|
+
subtree: true,
|
|
124
|
+
childList: true,
|
|
125
|
+
characterData: true,
|
|
126
|
+
attributeFilter: [
|
|
127
|
+
'data-mark-title',
|
|
128
|
+
'aria-describedby'
|
|
129
|
+
]
|
|
130
|
+
});
|
|
98
131
|
const onFocusOut = (event)=>{
|
|
99
132
|
if (event.relatedTarget instanceof Node && section.contains(event.relatedTarget)) return;
|
|
133
|
+
focusTarget = null;
|
|
100
134
|
focused = null;
|
|
101
135
|
hide();
|
|
102
136
|
};
|
|
103
137
|
const onKeyDown = (event)=>{
|
|
104
138
|
if ('Escape' !== event.key) return;
|
|
139
|
+
focusTarget = null;
|
|
105
140
|
focused = null;
|
|
106
141
|
dismissed = true;
|
|
107
142
|
setShown(null);
|
|
108
143
|
};
|
|
109
144
|
section.addEventListener('pointerover', onPointerOver);
|
|
110
145
|
const onPointerLeave = ()=>{
|
|
146
|
+
pointed = null;
|
|
111
147
|
hovered = null;
|
|
112
148
|
showFocused();
|
|
113
149
|
};
|
|
@@ -115,15 +151,23 @@ const MarkTooltip = ({ container, dataTestId })=>{
|
|
|
115
151
|
section.addEventListener('focusin', onFocusIn);
|
|
116
152
|
section.addEventListener('focusout', onFocusOut);
|
|
117
153
|
section.addEventListener('keydown', onKeyDown);
|
|
118
|
-
|
|
154
|
+
const onScroll = ()=>{
|
|
155
|
+
pointed = null;
|
|
156
|
+
hovered = null;
|
|
157
|
+
focusTarget = null;
|
|
158
|
+
focused = null;
|
|
159
|
+
hide();
|
|
160
|
+
};
|
|
161
|
+
section.addEventListener('scroll', onScroll, true);
|
|
119
162
|
return ()=>{
|
|
120
163
|
clearTimeout(hideTimer);
|
|
164
|
+
observer.disconnect();
|
|
121
165
|
section.removeEventListener('pointerover', onPointerOver);
|
|
122
166
|
section.removeEventListener('pointerleave', onPointerLeave);
|
|
123
167
|
section.removeEventListener('focusin', onFocusIn);
|
|
124
168
|
section.removeEventListener('focusout', onFocusOut);
|
|
125
169
|
section.removeEventListener('keydown', onKeyDown);
|
|
126
|
-
section.removeEventListener('scroll',
|
|
170
|
+
section.removeEventListener('scroll', onScroll, true);
|
|
127
171
|
};
|
|
128
172
|
}, [
|
|
129
173
|
container
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkTooltip.d.ts","sourceRoot":"","sources":["../../src/decision-table/MarkTooltip.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"MarkTooltip.d.ts","sourceRoot":"","sources":["../../src/decision-table/MarkTooltip.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAwDlD,MAAM,WAAW,gBAAgB;IAE/B,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB;AAGD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAkIlD,CAAC"}
|
|
@@ -20,26 +20,37 @@ const markedFor = (target)=>{
|
|
|
20
20
|
const titlesOf = (badges)=>[
|
|
21
21
|
...new Set(badges.flatMap((badge)=>badge.dataset.markTitle?.split('\n') ?? []))
|
|
22
22
|
].join('\n');
|
|
23
|
+
const focusedMarkOf = (target)=>{
|
|
24
|
+
const badges = markedFor(target);
|
|
25
|
+
const [element] = badges;
|
|
26
|
+
return element ? {
|
|
27
|
+
element,
|
|
28
|
+
title: titlesOf(badges)
|
|
29
|
+
} : null;
|
|
30
|
+
};
|
|
31
|
+
const isMarked = (element)=>element?.isConnected === true && element.matches(MARKED);
|
|
32
|
+
const sameShown = (a, b)=>a.title === b.title && a.rect.top === b.rect.top && a.rect.left === b.rect.left && a.rect.width === b.rect.width && a.rect.height === b.rect.height;
|
|
23
33
|
const MarkTooltip = ({ container, dataTestId })=>{
|
|
24
34
|
const [shown, setShown] = useState(null);
|
|
25
35
|
useEffect(()=>{
|
|
26
36
|
const section = container();
|
|
27
37
|
if (!section) return;
|
|
28
38
|
let current = null;
|
|
29
|
-
let
|
|
39
|
+
let pointed = null;
|
|
30
40
|
let hovered = null;
|
|
41
|
+
let focusTarget = null;
|
|
31
42
|
let focused = null;
|
|
32
43
|
let dismissed = false;
|
|
44
|
+
let byFocus = false;
|
|
33
45
|
let hideTimer;
|
|
34
46
|
const show = (element, title = element?.dataset.markTitle)=>{
|
|
35
47
|
clearTimeout(hideTimer);
|
|
36
|
-
if (element === current &&
|
|
48
|
+
if (element === current && dismissed) return;
|
|
37
49
|
current = element;
|
|
38
|
-
currentTitle = title;
|
|
39
50
|
dismissed = false;
|
|
40
51
|
if (!element || !title) return void setShown(null);
|
|
41
52
|
const { top, left, width, height } = element.getBoundingClientRect();
|
|
42
|
-
|
|
53
|
+
const next = {
|
|
43
54
|
rect: {
|
|
44
55
|
top,
|
|
45
56
|
left,
|
|
@@ -47,39 +58,64 @@ const MarkTooltip = ({ container, dataTestId })=>{
|
|
|
47
58
|
height
|
|
48
59
|
},
|
|
49
60
|
title
|
|
50
|
-
}
|
|
61
|
+
};
|
|
62
|
+
setShown((was)=>was && sameShown(was, next) ? was : next);
|
|
51
63
|
};
|
|
52
64
|
const hide = ()=>show(null);
|
|
53
|
-
const showFocused = ()=>
|
|
65
|
+
const showFocused = ()=>{
|
|
66
|
+
byFocus = true;
|
|
67
|
+
show(focused?.element ?? null, focused?.title);
|
|
68
|
+
};
|
|
54
69
|
const onPointerOver = (event)=>{
|
|
55
70
|
const marked = markedAt(event.target);
|
|
71
|
+
pointed = event.target instanceof Element ? event.target : null;
|
|
56
72
|
hovered = marked;
|
|
57
73
|
clearTimeout(hideTimer);
|
|
74
|
+
if (marked) byFocus = false;
|
|
58
75
|
if (marked || !current) show(marked);
|
|
59
76
|
else if (current !== focused?.element && !isOnTooltip(event.target)) hideTimer = setTimeout(showFocused, HIDE_DELAY_MS);
|
|
60
77
|
};
|
|
61
78
|
const onFocusIn = (event)=>{
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
focused = element ? {
|
|
65
|
-
element,
|
|
66
|
-
title: titlesOf(badges)
|
|
67
|
-
} : null;
|
|
79
|
+
focusTarget = event.target instanceof Element ? event.target : null;
|
|
80
|
+
focused = focusedMarkOf(focusTarget);
|
|
68
81
|
if (focused || !hovered) showFocused();
|
|
69
82
|
};
|
|
83
|
+
const onMarksChange = ()=>{
|
|
84
|
+
hovered = pointed?.isConnected ? markedAt(pointed) : null;
|
|
85
|
+
const was = focused?.element;
|
|
86
|
+
if (focusTarget) focused = focusTarget.isConnected ? focusedMarkOf(focusTarget) : null;
|
|
87
|
+
if (byFocus && focused) showFocused();
|
|
88
|
+
else if (hovered) show(hovered);
|
|
89
|
+
else if (null === current ? null === focusTarget : current !== was && isMarked(current)) {
|
|
90
|
+
if (isOnTooltip(pointed)) show(current);
|
|
91
|
+
} else showFocused();
|
|
92
|
+
};
|
|
93
|
+
const observer = new MutationObserver(onMarksChange);
|
|
94
|
+
observer.observe(section, {
|
|
95
|
+
subtree: true,
|
|
96
|
+
childList: true,
|
|
97
|
+
characterData: true,
|
|
98
|
+
attributeFilter: [
|
|
99
|
+
'data-mark-title',
|
|
100
|
+
'aria-describedby'
|
|
101
|
+
]
|
|
102
|
+
});
|
|
70
103
|
const onFocusOut = (event)=>{
|
|
71
104
|
if (event.relatedTarget instanceof Node && section.contains(event.relatedTarget)) return;
|
|
105
|
+
focusTarget = null;
|
|
72
106
|
focused = null;
|
|
73
107
|
hide();
|
|
74
108
|
};
|
|
75
109
|
const onKeyDown = (event)=>{
|
|
76
110
|
if ('Escape' !== event.key) return;
|
|
111
|
+
focusTarget = null;
|
|
77
112
|
focused = null;
|
|
78
113
|
dismissed = true;
|
|
79
114
|
setShown(null);
|
|
80
115
|
};
|
|
81
116
|
section.addEventListener('pointerover', onPointerOver);
|
|
82
117
|
const onPointerLeave = ()=>{
|
|
118
|
+
pointed = null;
|
|
83
119
|
hovered = null;
|
|
84
120
|
showFocused();
|
|
85
121
|
};
|
|
@@ -87,15 +123,23 @@ const MarkTooltip = ({ container, dataTestId })=>{
|
|
|
87
123
|
section.addEventListener('focusin', onFocusIn);
|
|
88
124
|
section.addEventListener('focusout', onFocusOut);
|
|
89
125
|
section.addEventListener('keydown', onKeyDown);
|
|
90
|
-
|
|
126
|
+
const onScroll = ()=>{
|
|
127
|
+
pointed = null;
|
|
128
|
+
hovered = null;
|
|
129
|
+
focusTarget = null;
|
|
130
|
+
focused = null;
|
|
131
|
+
hide();
|
|
132
|
+
};
|
|
133
|
+
section.addEventListener('scroll', onScroll, true);
|
|
91
134
|
return ()=>{
|
|
92
135
|
clearTimeout(hideTimer);
|
|
136
|
+
observer.disconnect();
|
|
93
137
|
section.removeEventListener('pointerover', onPointerOver);
|
|
94
138
|
section.removeEventListener('pointerleave', onPointerLeave);
|
|
95
139
|
section.removeEventListener('focusin', onFocusIn);
|
|
96
140
|
section.removeEventListener('focusout', onFocusOut);
|
|
97
141
|
section.removeEventListener('keydown', onKeyDown);
|
|
98
|
-
section.removeEventListener('scroll',
|
|
142
|
+
section.removeEventListener('scroll', onScroll, true);
|
|
99
143
|
};
|
|
100
144
|
}, [
|
|
101
145
|
container
|
|
@@ -29,6 +29,7 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
29
29
|
const jsx_runtime_namespaceObject = require("react/jsx-runtime");
|
|
30
30
|
const apollo_wind_namespaceObject = require("@uipath/apollo-wind");
|
|
31
31
|
const external_sentenceStyles_cjs_namespaceObject = require("./sentenceStyles.cjs");
|
|
32
|
+
const selectable = (options)=>options.filter(({ id }, index)=>'' !== id && options.findIndex((option)=>option.id === id) === index);
|
|
32
33
|
const PopoverSelect = ({ value, options, onChange, open, onOpenChange, returnFocus, container, label, id, dataTestId })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(apollo_wind_namespaceObject.Select, {
|
|
33
34
|
value: value,
|
|
34
35
|
onValueChange: onChange,
|
|
@@ -48,7 +49,7 @@ const PopoverSelect = ({ value, options, onChange, open, onOpenChange, returnFoc
|
|
|
48
49
|
event.preventDefault();
|
|
49
50
|
returnFocus();
|
|
50
51
|
}),
|
|
51
|
-
children: options.map((option)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(apollo_wind_namespaceObject.SelectItem, {
|
|
52
|
+
children: selectable(options).map((option)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(apollo_wind_namespaceObject.SelectItem, {
|
|
52
53
|
value: option.id,
|
|
53
54
|
children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("span", {
|
|
54
55
|
className: external_sentenceStyles_cjs_namespaceObject.POPOVER_OPTION_CLASS,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopoverSelect.d.ts","sourceRoot":"","sources":["../../src/decision-table/PopoverSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAyD,MAAM,qBAAqB,CAAC;AACpG,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB;AAED,MAAM,WAAW,kBACf,SAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACxC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAE/B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB,SAAS,EAAE,WAAW,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"PopoverSelect.d.ts","sourceRoot":"","sources":["../../src/decision-table/PopoverSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAyD,MAAM,qBAAqB,CAAC;AACpG,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB;AAED,MAAM,WAAW,kBACf,SAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACxC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAE/B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB,SAAS,EAAE,WAAW,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;CACpB;AASD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA6CtD,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@uipath/apollo-wind";
|
|
3
3
|
import { POPOVER_FIELD_CLASS, POPOVER_ICON_CLASS, POPOVER_OPTION_CLASS } from "./sentenceStyles.js";
|
|
4
|
+
const selectable = (options)=>options.filter(({ id }, index)=>'' !== id && options.findIndex((option)=>option.id === id) === index);
|
|
4
5
|
const PopoverSelect = ({ value, options, onChange, open, onOpenChange, returnFocus, container, label, id, dataTestId })=>/*#__PURE__*/ jsxs(Select, {
|
|
5
6
|
value: value,
|
|
6
7
|
onValueChange: onChange,
|
|
@@ -20,7 +21,7 @@ const PopoverSelect = ({ value, options, onChange, open, onOpenChange, returnFoc
|
|
|
20
21
|
event.preventDefault();
|
|
21
22
|
returnFocus();
|
|
22
23
|
}),
|
|
23
|
-
children: options.map((option)=>/*#__PURE__*/ jsx(SelectItem, {
|
|
24
|
+
children: selectable(options).map((option)=>/*#__PURE__*/ jsx(SelectItem, {
|
|
24
25
|
value: option.id,
|
|
25
26
|
children: /*#__PURE__*/ jsxs("span", {
|
|
26
27
|
className: POPOVER_OPTION_CLASS,
|