@alpaca-editor/core 1.0.4070 → 1.0.4073
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/components/index.d.ts +2 -0
- package/dist/components/index.js +1 -0
- package/dist/components/index.js.map +1 -1
- package/dist/components/ui/select.d.ts +17 -0
- package/dist/components/ui/select.js +32 -0
- package/dist/components/ui/select.js.map +1 -0
- package/dist/components/ui/textarea.js +1 -1
- package/dist/components/ui/textarea.js.map +1 -1
- package/dist/editor/FieldListField.js.map +1 -1
- package/dist/editor/FieldListFieldWithFallbacks.js +8 -7
- package/dist/editor/FieldListFieldWithFallbacks.js.map +1 -1
- package/dist/editor/ai/AgentTerminal.js +43 -6
- package/dist/editor/ai/AgentTerminal.js.map +1 -1
- package/dist/editor/ai/AiResponseMessage.js +93 -45
- package/dist/editor/ai/AiResponseMessage.js.map +1 -1
- package/dist/editor/client/EditorClient.js +44 -26
- package/dist/editor/client/EditorClient.js.map +1 -1
- package/dist/editor/client/editContext.d.ts +10 -6
- package/dist/editor/client/editContext.js +12 -3
- package/dist/editor/client/editContext.js.map +1 -1
- package/dist/editor/client/itemsRepository.js +1 -2
- package/dist/editor/client/itemsRepository.js.map +1 -1
- package/dist/editor/commands/componentCommands.js +2 -8
- package/dist/editor/commands/componentCommands.js.map +1 -1
- package/dist/editor/editor-warnings/ValidationErrors.js +5 -2
- package/dist/editor/editor-warnings/ValidationErrors.js.map +1 -1
- package/dist/editor/field-types/DropLinkEditor.js +12 -24
- package/dist/editor/field-types/DropLinkEditor.js.map +1 -1
- package/dist/editor/field-types/DropListEditor.js +14 -25
- package/dist/editor/field-types/DropListEditor.js.map +1 -1
- package/dist/editor/field-types/MultiLineText.js +9 -9
- package/dist/editor/field-types/MultiLineText.js.map +1 -1
- package/dist/editor/field-types/RichTextEditorComponent.js +1 -1
- package/dist/editor/field-types/RichTextEditorComponent.js.map +1 -1
- package/dist/editor/field-types/SingleLineText.js +18 -17
- package/dist/editor/field-types/SingleLineText.js.map +1 -1
- package/dist/editor/page-editor-chrome/CommentHighlighting.js +4 -3
- package/dist/editor/page-editor-chrome/CommentHighlighting.js.map +1 -1
- package/dist/editor/page-editor-chrome/FieldEditedIndicator.js +3 -2
- package/dist/editor/page-editor-chrome/FieldEditedIndicator.js.map +1 -1
- package/dist/editor/page-editor-chrome/FieldEditedIndicators.js +2 -2
- package/dist/editor/page-editor-chrome/FieldEditedIndicators.js.map +1 -1
- package/dist/editor/page-editor-chrome/InlineEditor.js +15 -14
- package/dist/editor/page-editor-chrome/InlineEditor.js.map +1 -1
- package/dist/editor/page-editor-chrome/SuggestionHighlighting.js +4 -3
- package/dist/editor/page-editor-chrome/SuggestionHighlighting.js.map +1 -1
- package/dist/editor/page-editor-chrome/useInlineAICompletion.js +17 -13
- package/dist/editor/page-editor-chrome/useInlineAICompletion.js.map +1 -1
- package/dist/editor/page-viewer/PageViewer.js +3 -3
- package/dist/editor/page-viewer/PageViewer.js.map +1 -1
- package/dist/editor/page-viewer/PageViewerFrame.js +14 -12
- package/dist/editor/page-viewer/PageViewerFrame.js.map +1 -1
- package/dist/editor/reviews/Comment.js +3 -2
- package/dist/editor/reviews/Comment.js.map +1 -1
- package/dist/editor/reviews/CommentPopover.js +6 -5
- package/dist/editor/reviews/CommentPopover.js.map +1 -1
- package/dist/editor/reviews/SuggestedEdit.js +6 -5
- package/dist/editor/reviews/SuggestedEdit.js.map +1 -1
- package/dist/editor/reviews/SuggestionDisplayPopover.js +3 -2
- package/dist/editor/reviews/SuggestionDisplayPopover.js.map +1 -1
- package/dist/editor/sidebar/DictionaryEditor.js +5 -5
- package/dist/editor/sidebar/DictionaryEditor.js.map +1 -1
- package/dist/editor/sidebar/EditHistory.js +9 -4
- package/dist/editor/sidebar/EditHistory.js.map +1 -1
- package/dist/editor/sidebar/Validation.js +3 -2
- package/dist/editor/sidebar/Validation.js.map +1 -1
- package/dist/page-wizard/steps/ContentStep.js +4 -3
- package/dist/page-wizard/steps/ContentStep.js.map +1 -1
- package/dist/revision.d.ts +2 -2
- package/dist/revision.js +2 -2
- package/dist/styles.css +3 -0
- package/package.json +1 -1
- package/src/components/index.ts +2 -0
- package/src/components/ui/select.tsx +134 -0
- package/src/components/ui/textarea.tsx +1 -1
- package/src/editor/FieldListField.tsx +1 -1
- package/src/editor/FieldListFieldWithFallbacks.tsx +15 -7
- package/src/editor/ai/AgentTerminal.tsx +44 -6
- package/src/editor/ai/AiResponseMessage.tsx +125 -67
- package/src/editor/client/EditorClient.tsx +52 -30
- package/src/editor/client/editContext.ts +29 -10
- package/src/editor/client/itemsRepository.ts +1 -2
- package/src/editor/commands/componentCommands.tsx +3 -10
- package/src/editor/editor-warnings/ValidationErrors.tsx +11 -7
- package/src/editor/field-types/DropLinkEditor.tsx +21 -31
- package/src/editor/field-types/DropListEditor.tsx +28 -35
- package/src/editor/field-types/MultiLineText.tsx +11 -12
- package/src/editor/field-types/RichTextEditorComponent.tsx +4 -8
- package/src/editor/field-types/SingleLineText.tsx +21 -19
- package/src/editor/page-editor-chrome/CommentHighlighting.tsx +4 -6
- package/src/editor/page-editor-chrome/FieldEditedIndicator.tsx +7 -2
- package/src/editor/page-editor-chrome/FieldEditedIndicators.tsx +2 -2
- package/src/editor/page-editor-chrome/InlineEditor.tsx +20 -14
- package/src/editor/page-editor-chrome/SuggestionHighlighting.tsx +4 -6
- package/src/editor/page-editor-chrome/useInlineAICompletion.tsx +17 -13
- package/src/editor/page-viewer/PageViewer.tsx +3 -6
- package/src/editor/page-viewer/PageViewerFrame.tsx +21 -12
- package/src/editor/reviews/Comment.tsx +3 -2
- package/src/editor/reviews/CommentPopover.tsx +10 -5
- package/src/editor/reviews/SuggestedEdit.tsx +6 -5
- package/src/editor/reviews/SuggestionDisplayPopover.tsx +3 -2
- package/src/editor/sidebar/DictionaryEditor.tsx +10 -13
- package/src/editor/sidebar/EditHistory.tsx +11 -4
- package/src/editor/sidebar/Validation.tsx +3 -2
- package/src/page-wizard/steps/ContentStep.tsx +4 -3
- package/src/revision.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationErrors.js","sourceRoot":"","sources":["../../../src/editor/editor-warnings/ValidationErrors.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,MAAM,UAAU,gBAAgB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAsB;IACxE,IAAI,gBAAgB,GAAG,WAAW,CAAC,gBAAgB;QACjD,EAAE,IAAI,CACJ,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;QACrB,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;QACjC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAClC;QACD,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,WAAW,CAAC,gBAAgB,EAAE,IAAI,CACnD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAChD,CAAC;QAEF,IAAI,UAAU;YACZ,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,MAAM;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,MAAM,GAAG,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE1D,OAAO,CACL,MAAC,aAAa,IAAC,KAAK,EAAC,YAAY,EAAC,QAAQ,EAAC,SAAS,aACjD,gBAAgB;gBACf,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"ValidationErrors.js","sourceRoot":"","sources":["../../../src/editor/editor-warnings/ValidationErrors.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,MAAM,UAAU,gBAAgB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAsB;IACxE,IAAI,gBAAgB,GAAG,WAAW,CAAC,gBAAgB;QACjD,EAAE,IAAI,CACJ,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;QACrB,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;QACjC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAClC;QACD,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,WAAW,CAAC,gBAAgB,EAAE,IAAI,CACnD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAChD,CAAC;QAEF,IAAI,UAAU;YACZ,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,MAAM;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,MAAM,GAAG,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE1D,OAAO,CACL,MAAC,aAAa,IAAC,KAAK,EAAC,YAAY,EAAC,QAAQ,EAAC,SAAS,aACjD,gBAAgB;gBACf,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAwB,CAAC,CAAC,OAAO,IAAvB,CAAC,CAAC,SAAS,CAAmB,CAAC,EACtD,MAAM,EAAE,MAAM,GAAG,CAAC,IAAI,CACrB,4EACiD,GAAG,EACjD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACjB,eACE,SAAS,EAAC,0BAA0B,EAEpC,OAAO,EAAE,GAAG,EAAE;4BACZ,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,CAC1B,CAAC;4BACF,IACG,KAAa,EAAE,UAAU;gCACzB,WAAmB,EAAE,eAAe,EACrC,CAAC;gCACD,iEAAiE;gCACjE,WAAW,CAAC,eAAe,CAAE,KAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;4BAChE,CAAC;wBACH,CAAC,YAEA,CAAC,CAAC,SAAS,IAdP,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,CAevB,CACR,CAAC,IACE,CACP,IACa,CACjB,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
-
import { Dropdown } from "primereact/dropdown";
|
|
4
3
|
import { useEditContext } from "../client/editContext";
|
|
5
|
-
import { useEffect, useState } from "react";
|
|
4
|
+
import { useEffect, useState, useCallback, useMemo } from "react";
|
|
6
5
|
import { getLookupSources } from "../services/editService";
|
|
7
6
|
import { normalizeGuid } from "../utils";
|
|
7
|
+
import { Select } from "../../components";
|
|
8
8
|
export function DropLinkEditor({ field, readOnly, }) {
|
|
9
9
|
const editContext = useEditContext();
|
|
10
10
|
const [lazyItems, setLazyItems] = useState([]);
|
|
@@ -21,34 +21,22 @@ export function DropLinkEditor({ field, readOnly, }) {
|
|
|
21
21
|
field.descriptor.item.language +
|
|
22
22
|
field.descriptor.item.version,
|
|
23
23
|
]);
|
|
24
|
-
const onLazyLoad = async () => {
|
|
24
|
+
const onLazyLoad = useCallback(async () => {
|
|
25
25
|
setLazyLoading(true);
|
|
26
26
|
const options = await getLookupSources(field, editContext.sessionId);
|
|
27
27
|
setLazyItems(options);
|
|
28
28
|
setLazyLoading(false);
|
|
29
|
-
};
|
|
30
|
-
|
|
29
|
+
}, [field, editContext.sessionId]);
|
|
30
|
+
// Convert ItemIdAndName[] to SelectOption[] - memoized to prevent recreation
|
|
31
|
+
const selectOptions = useMemo(() => lazyItems.map((item) => ({
|
|
32
|
+
value: item.id,
|
|
33
|
+
label: item.name,
|
|
34
|
+
})), [lazyItems]);
|
|
35
|
+
return (_jsx(Select, { value: field.value?.targetItemId, onValueChange: (value) => {
|
|
31
36
|
editContext?.operations.editField({
|
|
32
37
|
field: field.descriptor,
|
|
33
|
-
rawValue: normalizeGuid(
|
|
38
|
+
rawValue: normalizeGuid(value),
|
|
34
39
|
});
|
|
35
|
-
}, options:
|
|
36
|
-
lazy: true,
|
|
37
|
-
onLazyLoad: onLazyLoad,
|
|
38
|
-
itemSize: 38,
|
|
39
|
-
// showLoader: true,
|
|
40
|
-
loading: lazyLoading,
|
|
41
|
-
//delay: 250,
|
|
42
|
-
// loadingTemplate: (options) => {
|
|
43
|
-
// return (
|
|
44
|
-
// <div
|
|
45
|
-
// className="flex align-items-center p-2"
|
|
46
|
-
// style={{ height: "38px" }}
|
|
47
|
-
// >
|
|
48
|
-
// <Skeleton width={options.even ? "60%" : "50%"} height="1rem" />
|
|
49
|
-
// </div>
|
|
50
|
-
// );
|
|
51
|
-
// },
|
|
52
|
-
} }));
|
|
40
|
+
}, options: selectOptions, placeholder: "Select", disabled: readOnly, className: "md:w-14rem w-full", loading: lazyLoading, onLazyLoad: onLazyLoad, emptyMessage: "No options available" }));
|
|
53
41
|
}
|
|
54
42
|
//# sourceMappingURL=DropLinkEditor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DropLinkEditor.js","sourceRoot":"","sources":["../../../src/editor/field-types/DropLinkEditor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DropLinkEditor.js","sourceRoot":"","sources":["../../../src/editor/field-types/DropLinkEditor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,MAAM,EAAgB,MAAM,kBAAkB,CAAC;AAExD,MAAM,UAAU,cAAc,CAAC,EAC7B,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAkB,EAAE,CAAC,CAAC;IAChE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAU,IAAI,CAAC,CAAC;IAE9D,IAAI,CAAC,KAAK;QAAE,OAAO;IAEnB,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,EAAE,CAAC;IACf,CAAC,EAAE;QACD,KAAK,CAAC,UAAU,CAAC,OAAO;YACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ;YAC9B,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO;KAChC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QACrE,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnC,6EAA6E;IAC7E,MAAM,aAAa,GAAmB,OAAO,CAAC,GAAG,EAAE,CACjD,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,IAAI,CAAC,EAAE;QACd,KAAK,EAAE,IAAI,CAAC,IAAI;KACjB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CACjB,CAAC;IAEF,OAAO,CACL,KAAC,MAAM,IACL,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,YAAY,EAChC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC;gBAChC,KAAK,EAAE,KAAK,CAAC,UAAU;gBACvB,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC;aAC/B,CAAC,CAAC;QACL,CAAC,EACD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAC,QAAQ,EACpB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAC,mBAAmB,EAC7B,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAC,sBAAsB,GACnC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
-
import { Dropdown } from "primereact/dropdown";
|
|
4
3
|
import { useEditContext } from "../client/editContext";
|
|
5
|
-
import { useEffect, useState } from "react";
|
|
4
|
+
import { useEffect, useState, useCallback, useMemo } from "react";
|
|
6
5
|
import { getLookupSources } from "../services/editService";
|
|
6
|
+
import { Select } from "../../components";
|
|
7
7
|
export function DropListEditor({ field, readOnly, }) {
|
|
8
8
|
const editContext = useEditContext();
|
|
9
9
|
const [lazyItems, setLazyItems] = useState([]);
|
|
@@ -15,7 +15,7 @@ export function DropListEditor({ field, readOnly, }) {
|
|
|
15
15
|
useEffect(() => {
|
|
16
16
|
onLazyLoad();
|
|
17
17
|
}, [field.descriptor]);
|
|
18
|
-
const onLazyLoad = async () => {
|
|
18
|
+
const onLazyLoad = useCallback(async () => {
|
|
19
19
|
setLazyLoading(true);
|
|
20
20
|
const options = await getLookupSources(field, editContext.sessionId);
|
|
21
21
|
if (field.value && !options.find((o) => o.name === field.value)) {
|
|
@@ -27,30 +27,19 @@ export function DropListEditor({ field, readOnly, }) {
|
|
|
27
27
|
}
|
|
28
28
|
setLazyItems(options);
|
|
29
29
|
setLazyLoading(false);
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
}, [field, editContext.sessionId]);
|
|
31
|
+
// Convert ItemIdAndName[] to SelectOption[] using name for both value and label - memoized
|
|
32
|
+
const selectOptions = useMemo(() => lazyItems.map((item) => ({
|
|
33
|
+
value: item.name,
|
|
34
|
+
label: item.name,
|
|
35
|
+
})), [lazyItems]);
|
|
36
|
+
// Find the current value or show unknown value - memoized
|
|
37
|
+
const currentValue = useMemo(() => lazyItems.find((o) => o.name === field.value)?.name || field.value, [lazyItems, field.value]);
|
|
38
|
+
return (_jsx(Select, { value: currentValue, onValueChange: (value) => {
|
|
33
39
|
editContext?.operations.editField({
|
|
34
40
|
field: field.descriptor,
|
|
35
|
-
rawValue:
|
|
41
|
+
rawValue: value,
|
|
36
42
|
});
|
|
37
|
-
}, options:
|
|
38
|
-
lazy: true,
|
|
39
|
-
onLazyLoad: onLazyLoad,
|
|
40
|
-
itemSize: 38,
|
|
41
|
-
// showLoader: true,
|
|
42
|
-
loading: lazyLoading,
|
|
43
|
-
//delay: 250,
|
|
44
|
-
// loadingTemplate: (options) => {
|
|
45
|
-
// return (
|
|
46
|
-
// <div
|
|
47
|
-
// className="flex align-items-center p-2"
|
|
48
|
-
// style={{ height: "38px" }}
|
|
49
|
-
// >
|
|
50
|
-
// <Skeleton width={options.even ? "60%" : "50%"} height="1rem" />
|
|
51
|
-
// </div>
|
|
52
|
-
// );
|
|
53
|
-
// },
|
|
54
|
-
} }));
|
|
43
|
+
}, options: selectOptions, placeholder: "Select", disabled: readOnly, className: "md:w-14rem w-full", loading: lazyLoading, onLazyLoad: onLazyLoad, emptyMessage: "No options available" }));
|
|
55
44
|
}
|
|
56
45
|
//# sourceMappingURL=DropListEditor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DropListEditor.js","sourceRoot":"","sources":["../../../src/editor/field-types/DropListEditor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DropListEditor.js","sourceRoot":"","sources":["../../../src/editor/field-types/DropListEditor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,MAAM,EAAgB,MAAM,kBAAkB,CAAC;AAExD,MAAM,UAAU,cAAc,CAAC,EAC7B,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAkB,EAAE,CAAC,CAAC;IAChE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAU,IAAI,CAAC,CAAC;IAE9D,IAAI,CAAC,KAAK;QAAE,OAAO;IAEnB,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,EAAE,CAAC;IACf,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAEvB,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAChE,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,CAAC,OAAO,CAAC;gBACd,EAAE,EAAE,SAAS;gBACb,IAAI,EAAE,aAAa,KAAK,CAAC,KAAK,GAAG;aAClC,CAAC,CAAC;QACL,CAAC;QACD,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnC,2FAA2F;IAC3F,MAAM,aAAa,GAAmB,OAAO,CAAC,GAAG,EAAE,CACjD,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,IAAI,CAAC,IAAI;QAChB,KAAK,EAAE,IAAI,CAAC,IAAI;KACjB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CACjB,CAAC;IAEF,0DAA0D;IAC1D,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAChC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,KAAK,CAAC,KAAK,EAClE,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CACzB,CAAC;IAEF,OAAO,CACL,KAAC,MAAM,IACL,KAAK,EAAE,YAAY,EACnB,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC;gBAChC,KAAK,EAAE,KAAK,CAAC,UAAU;gBACvB,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;QACL,CAAC,EACD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAC,QAAQ,EACpB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAC,mBAAmB,EAC7B,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAC,sBAAsB,GACnC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
3
|
import { InputTextarea } from "primereact/inputtextarea";
|
|
4
|
-
import {
|
|
4
|
+
import { useEditContextRef, useFieldsEditContextRef, } from "../client/editContext";
|
|
5
5
|
import { useFieldModification } from "../client/fieldModificationStore";
|
|
6
6
|
import { useEffect, useRef, useState } from "react";
|
|
7
7
|
export function MultiLineText({ field, readOnly, updateFieldValue, }) {
|
|
8
8
|
const editContextRef = useEditContextRef();
|
|
9
|
-
const
|
|
9
|
+
const fieldsContextRef = useFieldsEditContextRef();
|
|
10
10
|
const inputRef = useRef(null);
|
|
11
11
|
const fieldItem = field.descriptor.item;
|
|
12
12
|
const [value, setValue] = useState(field.value);
|
|
@@ -26,12 +26,12 @@ export function MultiLineText({ field, readOnly, updateFieldValue, }) {
|
|
|
26
26
|
return;
|
|
27
27
|
useEffect(() => {
|
|
28
28
|
setTimeout(() => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
const focusedField = fieldsContextRef.current?.focusedField;
|
|
30
|
+
if (!fieldsContextRef.current?.inlineEditingFieldElement &&
|
|
31
|
+
focusedField?.fieldId === field.id &&
|
|
32
|
+
focusedField?.item.id === fieldItem.id &&
|
|
33
|
+
focusedField?.item.language === fieldItem.language &&
|
|
34
|
+
focusedField?.item.version === fieldItem.version) {
|
|
35
35
|
// Only focus if no other element currently has focus (e.g., popover buttons)
|
|
36
36
|
if (inputRef.current &&
|
|
37
37
|
(!document.activeElement || document.activeElement === document.body)) {
|
|
@@ -39,7 +39,7 @@ export function MultiLineText({ field, readOnly, updateFieldValue, }) {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}, 500);
|
|
42
|
-
}, [
|
|
42
|
+
}, [fieldsContextRef.current?.focusedField]);
|
|
43
43
|
return (_jsx(InputTextarea, { ref: inputRef, value: value, disabled: readOnly, className: "focus-shadow bg-gray-5 p-2 text-xs", style: { width: "100%" }, rows: 12, onChange: (e) => {
|
|
44
44
|
setValue(e.target.value);
|
|
45
45
|
updateFieldValue(e.target.value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiLineText.js","sourceRoot":"","sources":["../../../src/editor/field-types/MultiLineText.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"MultiLineText.js","sourceRoot":"","sources":["../../../src/editor/field-types/MultiLineText.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
-
import { useEditContextRef
|
|
3
|
+
import { useEditContextRef } from "../client/editContext";
|
|
4
4
|
import { useFieldModification } from "../client/fieldModificationStore";
|
|
5
5
|
import { useThrottledCallback } from "use-debounce";
|
|
6
6
|
import { useEffect, useRef, useState } from "react";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RichTextEditorComponent.js","sourceRoot":"","sources":["../../../src/editor/field-types/RichTextEditorComponent.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,
|
|
1
|
+
{"version":3,"file":"RichTextEditorComponent.js","sourceRoot":"","sources":["../../../src/editor/field-types/RichTextEditorComponent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
3
|
import { InputText } from "primereact/inputtext";
|
|
4
|
-
import { useEditContext, useEditContextRef, } from "../client/editContext";
|
|
4
|
+
import { useEditContext, useEditContextRef, useFieldsEditContextRef, } from "../client/editContext";
|
|
5
5
|
import { useFieldModification } from "../client/fieldModificationStore";
|
|
6
6
|
import { useEffect, useRef, useState } from "react";
|
|
7
7
|
import { RefreshCw } from "lucide-react";
|
|
8
8
|
export function SingleLineText({ field, readOnly, updateFieldValue, }) {
|
|
9
9
|
const editContextRef = useEditContextRef();
|
|
10
10
|
const editContext = useEditContext();
|
|
11
|
+
const fieldsContextRef = useFieldsEditContextRef();
|
|
11
12
|
const inputRef = useRef(null);
|
|
12
13
|
// const [selectionStart, setSelectionStart] = useState(0);
|
|
13
14
|
// const [selectionEnd, setSelectionEnd] = useState(0);
|
|
@@ -48,18 +49,18 @@ export function SingleLineText({ field, readOnly, updateFieldValue, }) {
|
|
|
48
49
|
text: target.value.slice(target.selectionStart || 0, target.selectionEnd || 0),
|
|
49
50
|
};
|
|
50
51
|
if (range.text !== editContext?.selectedRange?.text ||
|
|
51
|
-
(range.text && range.fieldId !== editContext?.selectedRange
|
|
52
|
-
range.itemId !== editContext
|
|
52
|
+
(range.text && range.fieldId !== editContext?.selectedRange?.fieldId) ||
|
|
53
|
+
range.itemId !== editContext?.selectedRange?.itemId) {
|
|
53
54
|
editContextRef.current?.setSelectedRange(range);
|
|
54
55
|
}
|
|
55
56
|
};
|
|
56
57
|
useEffect(() => {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const range = editContextRef.current
|
|
58
|
+
const focusedField = fieldsContextRef.current?.focusedField;
|
|
59
|
+
if (focusedField?.fieldId === field.id &&
|
|
60
|
+
focusedField?.item.id === fieldItem.id &&
|
|
61
|
+
focusedField?.item.language === fieldItem.language &&
|
|
62
|
+
focusedField?.item.version === fieldItem.version) {
|
|
63
|
+
const range = editContextRef.current?.selectedRange;
|
|
63
64
|
if (range && inputRef.current) {
|
|
64
65
|
inputRef.current.setSelectionRange(range.startOffset, range.endOffset);
|
|
65
66
|
// setSelectionStart(range.startOffset);
|
|
@@ -91,12 +92,12 @@ export function SingleLineText({ field, readOnly, updateFieldValue, }) {
|
|
|
91
92
|
// };
|
|
92
93
|
useEffect(() => {
|
|
93
94
|
setTimeout(() => {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
95
|
+
const focusedField = fieldsContextRef.current?.focusedField;
|
|
96
|
+
if (!fieldsContextRef.current?.inlineEditingFieldElement &&
|
|
97
|
+
focusedField?.fieldId === field.id &&
|
|
98
|
+
focusedField?.item.id === fieldItem.id &&
|
|
99
|
+
focusedField?.item.language === fieldItem.language &&
|
|
100
|
+
focusedField?.item.version === fieldItem.version) {
|
|
100
101
|
// Only focus if no other element currently has focus (e.g., popover buttons)
|
|
101
102
|
if (inputRef.current &&
|
|
102
103
|
(!document.activeElement || document.activeElement === document.body)) {
|
|
@@ -104,9 +105,9 @@ export function SingleLineText({ field, readOnly, updateFieldValue, }) {
|
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
}, 500);
|
|
107
|
-
}, [
|
|
108
|
+
}, [fieldsContextRef.current?.focusedField]);
|
|
108
109
|
const customSource = field?.customProperties?.source;
|
|
109
110
|
const isManualRefreshEnabled = typeof customSource === "string" && customSource.includes("manual-refresh");
|
|
110
|
-
return (_jsxs("div", { className: "relative", children: [_jsx(InputText, { ref: inputRef, value: value || "", disabled: readOnly, className: "focus-shadow bg-gray-5 p-1.5 pr-7 text-xs", style: { width: "100%" }, onChange: handleChange, onSelect: handleSelect, onBlur: editContextRef.current?.operations.onFieldBlur }, fieldItem.id + field.id + fieldItem.language + fieldItem.version), isManualRefreshEnabled && (_jsx("button", { type: "button", title: "Re-render", className: "absolute
|
|
111
|
+
return (_jsxs("div", { className: "relative", children: [_jsx(InputText, { ref: inputRef, value: value || "", disabled: readOnly, className: "focus-shadow bg-gray-5 p-1.5 pr-7 text-xs", style: { width: "100%" }, onChange: handleChange, onSelect: handleSelect, onBlur: editContextRef.current?.operations.onFieldBlur }, fieldItem.id + field.id + fieldItem.language + fieldItem.version), isManualRefreshEnabled && (_jsx("button", { type: "button", title: "Re-render", className: "absolute top-1/2 right-1 -translate-y-1/2 rounded p-1 text-gray-600 hover:text-gray-900", onClick: () => editContext?.requestRefresh("immediate"), children: _jsx(RefreshCw, { className: "h-4 w-4", strokeWidth: 1 }) }))] }));
|
|
111
112
|
}
|
|
112
113
|
//# sourceMappingURL=SingleLineText.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SingleLineText.js","sourceRoot":"","sources":["../../../src/editor/field-types/SingleLineText.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EACL,cAAc,EACd,iBAAiB,
|
|
1
|
+
{"version":3,"file":"SingleLineText.js","sourceRoot":"","sources":["../../../src/editor/field-types/SingleLineText.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
-
import { useEditContext,
|
|
2
|
+
import { useEditContext, useFieldsEditContext } from "../client/editContext";
|
|
3
3
|
import { findFieldElement } from "../utils";
|
|
4
4
|
import { useState } from "react";
|
|
5
5
|
import { useEffect } from "react";
|
|
@@ -9,7 +9,7 @@ import { CommentDisplayPopover } from "../reviews/CommentDisplayPopover";
|
|
|
9
9
|
export function CommentHighlighting({ comment, scale, iframe, }) {
|
|
10
10
|
const editContext = useEditContext();
|
|
11
11
|
const isSelected = comment.id === editContext?.selectedComment?.id;
|
|
12
|
-
const modifiedFields =
|
|
12
|
+
const modifiedFields = useFieldsEditContext();
|
|
13
13
|
const [range, setRange] = useState([
|
|
14
14
|
comment.rangeStart || 0,
|
|
15
15
|
comment.rangeEnd || 0,
|
|
@@ -136,7 +136,8 @@ export function CommentHighlighting({ comment, scale, iframe, }) {
|
|
|
136
136
|
editContext?.setScrollIntoView(comment.itemId);
|
|
137
137
|
editContext?.select([comment.itemId]);
|
|
138
138
|
if (comment.fieldId) {
|
|
139
|
-
|
|
139
|
+
const fieldsContext = modifiedFields; // alias for readability
|
|
140
|
+
fieldsContext?.setFocusedField({
|
|
140
141
|
fieldId: comment.fieldId,
|
|
141
142
|
item: {
|
|
142
143
|
id: comment.itemId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentHighlighting.js","sourceRoot":"","sources":["../../../src/editor/page-editor-chrome/CommentHighlighting.tsx"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"CommentHighlighting.js","sourceRoot":"","sources":["../../../src/editor/page-editor-chrome/CommentHighlighting.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
-
import { useEditContext } from "../client/editContext";
|
|
2
|
+
import { useEditContext, useFieldsEditContext, } from "../client/editContext";
|
|
3
3
|
export function FieldEditedIndicator({ field, scale, pageViewContext, scroll, }) {
|
|
4
4
|
const editContext = useEditContext();
|
|
5
|
+
const fieldsContext = useFieldsEditContext();
|
|
5
6
|
if (!editContext)
|
|
6
7
|
return null;
|
|
7
8
|
const fieldElements = pageViewContext.editorIframe?.contentWindow?.document.querySelectorAll(`[data-fieldid="${field.fieldId}"][data-itemid="${field.item.id}"][data-language="${field.item.language}"][data-version="${field.item.version}"]`);
|
|
8
9
|
if (!fieldElements)
|
|
9
10
|
return null;
|
|
10
11
|
return (_jsx(_Fragment, { children: [...fieldElements]
|
|
11
|
-
.filter((x) => x !=
|
|
12
|
+
.filter((x) => x != fieldsContext?.inlineEditingFieldElement)
|
|
12
13
|
.map((element) => (_jsx(SingleFieldEditedIndicator, { element: element, scale: scale, scroll: scroll }, field.fieldId + field.item.id))) }));
|
|
13
14
|
}
|
|
14
15
|
function SingleFieldEditedIndicator({ element, scale, scroll, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldEditedIndicator.js","sourceRoot":"","sources":["../../../src/editor/page-editor-chrome/FieldEditedIndicator.tsx"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"FieldEditedIndicator.js","sourceRoot":"","sources":["../../../src/editor/page-editor-chrome/FieldEditedIndicator.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEL,cAAc,EACd,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAG/B,MAAM,UAAU,oBAAoB,CAAC,EACnC,KAAK,EACL,KAAK,EACL,eAAe,EACf,MAAM,GAMP;IACC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,aAAa,GAAG,oBAAoB,EAAE,CAAC;IAC7C,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAE9B,MAAM,aAAa,GACjB,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,QAAQ,CAAC,gBAAgB,CACpE,kBAAkB,KAAK,CAAC,OAAO,mBAAmB,KAAK,CAAC,IAAI,CAAC,EAAE,qBAAqB,KAAK,CAAC,IAAI,CAAC,QAAQ,oBAAoB,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAClJ,CAAC;IAEJ,IAAI,CAAC,aAAa;QAAE,OAAO,IAAI,CAAC;IAChC,OAAO,CACL,4BACG,CAAC,GAAG,aAAa,CAAC;aAChB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,aAAa,EAAE,yBAAyB,CAAC;aAC5D,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAChB,KAAC,0BAA0B,IACzB,OAAO,EAAE,OAAO,EAEhB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,IAFT,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAGlC,CACH,CAAC,GACH,CACJ,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,EAClC,OAAO,EACP,KAAK,EACL,MAAM,GAKP;IACC,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAE7C,MAAM,aAAa,GAAG,IAAI,CAAC;IAC3B,OAAO,CACL,cACE,SAAS,EAAE,wDAAwD,EACnE,KAAK,EAAE;YACL,IAAI,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;YACpC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;YACrD,KAAK,EAAE,aAAa,CAAC,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;YACzC,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;YAC3C,MAAM,EAAE,GAAG;SACZ,GACD,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
-
import { useEditContext,
|
|
2
|
+
import { useEditContext, useFieldsEditContext } from "../client/editContext";
|
|
3
3
|
import { FieldEditedIndicator } from "./FieldEditedIndicator";
|
|
4
4
|
export function FieldEditedIndicators({ scale, pageViewContext, scroll, }) {
|
|
5
5
|
const editContext = useEditContext();
|
|
6
|
-
const modifiedFieldsContext =
|
|
6
|
+
const modifiedFieldsContext = useFieldsEditContext();
|
|
7
7
|
if (!editContext || !modifiedFieldsContext)
|
|
8
8
|
return null;
|
|
9
9
|
const fields = modifiedFieldsContext.recentEdits;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldEditedIndicators.js","sourceRoot":"","sources":["../../../src/editor/page-editor-chrome/FieldEditedIndicators.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"FieldEditedIndicators.js","sourceRoot":"","sources":["../../../src/editor/page-editor-chrome/FieldEditedIndicators.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,UAAU,qBAAqB,CAAC,EACpC,KAAK,EACL,eAAe,EACf,MAAM,GAKP;IACC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,qBAAqB,GAAG,oBAAoB,EAAE,CAAC;IAErD,IAAI,CAAC,WAAW,IAAI,CAAC,qBAAqB;QAAE,OAAO,IAAI,CAAC;IAExD,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC;IAEjD,OAAO,CACL,4BACG,MAAM;aACJ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;aAC5D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACd,KAAC,oBAAoB,IACnB,KAAK,EAAE,KAAK,EAEZ,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,IAHT,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,SAAS,CAIpD,CACH,CAAC,GACH,CACJ,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useEffect, useRef, useState } from "react";
|
|
2
|
-
import { useEditContext,
|
|
2
|
+
import { useEditContext, useFieldsEditContext, useEditContextRef, } from "../client/editContext";
|
|
3
3
|
import { useThrottledCallback } from "use-debounce";
|
|
4
4
|
import { getFieldDescriptorFromElement, hasFieldLock } from "../utils";
|
|
5
5
|
import { applyPatch, diffWords } from "diff";
|
|
@@ -10,7 +10,7 @@ import { useInlineAiCompletion } from "./useInlineAICompletion";
|
|
|
10
10
|
export function InlineEditor({ pageViewContext, compareView, }) {
|
|
11
11
|
const context = useEditContext();
|
|
12
12
|
const contextRef = useEditContextRef();
|
|
13
|
-
const modifiedFieldsContext =
|
|
13
|
+
const modifiedFieldsContext = useFieldsEditContext();
|
|
14
14
|
const [cursorSpanId] = useState(() => `cursor-indicator-${Math.random().toString(36).substring(2, 9)}`);
|
|
15
15
|
const isUpdatingRef = useRef(false);
|
|
16
16
|
if (!context)
|
|
@@ -31,7 +31,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
31
31
|
const debouncedSetFieldvalue = useThrottledCallback((value, fieldId, fieldName, itemId, language, version) => {
|
|
32
32
|
// Don't include our cursor indicator in the saved value
|
|
33
33
|
const iframeDocument = pageViewContext.editorIframe?.contentWindow?.document;
|
|
34
|
-
const element =
|
|
34
|
+
const element = modifiedFieldsContext?.inlineEditingFieldElement;
|
|
35
35
|
const isRichText = element?.getAttribute("data-is-richtext") === "true";
|
|
36
36
|
// Clone element to avoid modifying the original
|
|
37
37
|
if (element && iframeDocument) {
|
|
@@ -68,10 +68,10 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
68
68
|
useEffect(() => {
|
|
69
69
|
if (!context || compareView || context.mode === "preview")
|
|
70
70
|
return;
|
|
71
|
-
const element =
|
|
71
|
+
const element = modifiedFieldsContext?.inlineEditingFieldElement;
|
|
72
72
|
const editableElements = pageViewContext.editorIframe?.contentWindow?.document.querySelectorAll('[contenteditable="true"]');
|
|
73
73
|
editableElements?.forEach((element) => {
|
|
74
|
-
if (element !==
|
|
74
|
+
if (element !== modifiedFieldsContext?.inlineEditingFieldElement)
|
|
75
75
|
element.setAttribute("contenteditable", "false");
|
|
76
76
|
});
|
|
77
77
|
if (element) {
|
|
@@ -180,7 +180,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
180
180
|
}
|
|
181
181
|
}
|
|
182
182
|
async function updateFocusedFieldContent() {
|
|
183
|
-
const element =
|
|
183
|
+
const element = modifiedFieldsContext?.inlineEditingFieldElement;
|
|
184
184
|
if (!element)
|
|
185
185
|
return;
|
|
186
186
|
const savedPosition = saveCaretPosition(element);
|
|
@@ -195,7 +195,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
195
195
|
const version = parseInt(versionStr, 10);
|
|
196
196
|
const descriptor = { id: itemId, language, version };
|
|
197
197
|
// Retrieve the current field value from the repository.
|
|
198
|
-
const loadedItem = await
|
|
198
|
+
const loadedItem = await contextRef.current?.itemsRepository.getItem(descriptor);
|
|
199
199
|
if (!loadedItem)
|
|
200
200
|
return;
|
|
201
201
|
// Get the baseline value from the repository.
|
|
@@ -210,8 +210,8 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
210
210
|
baseValue = modField.value || "";
|
|
211
211
|
}
|
|
212
212
|
// If suggestions mode is active, merge all suggestions for this field.
|
|
213
|
-
if (
|
|
214
|
-
const fieldSuggestions =
|
|
213
|
+
if (contextRef.current?.mode === "suggestions") {
|
|
214
|
+
const fieldSuggestions = (contextRef.current?.suggestedEdits ?? []).filter((s) => s.fieldId === fieldId &&
|
|
215
215
|
s.itemId === itemId &&
|
|
216
216
|
s.mainItemLanguage === language &&
|
|
217
217
|
s.mainItemVersion === version);
|
|
@@ -265,7 +265,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
265
265
|
cursorElement.parentNode?.removeChild(cursorElement);
|
|
266
266
|
}
|
|
267
267
|
};
|
|
268
|
-
}, [
|
|
268
|
+
}, [modifiedFieldsContext?.inlineEditingFieldElement]);
|
|
269
269
|
function saveCaretPosition(editableElement) {
|
|
270
270
|
const selection = pageViewContext.editorIframe?.contentWindow?.getSelection();
|
|
271
271
|
if (!selection ||
|
|
@@ -366,7 +366,8 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
366
366
|
modifiedFieldsContext?.modifiedFields.forEach((field) => {
|
|
367
367
|
const elements = doc.querySelectorAll(`[data-fieldid="${field.fieldId}"][data-itemid="${field.item.id}"][data-language="${field.item.language}"][data-version="${field.item.version}"`);
|
|
368
368
|
elements?.forEach(async (element) => {
|
|
369
|
-
if (element &&
|
|
369
|
+
if (element &&
|
|
370
|
+
element !== modifiedFieldsContext?.inlineEditingFieldElement) {
|
|
370
371
|
const realField = await context.itemsRepository.getField(field);
|
|
371
372
|
const fieldType = realField?.type;
|
|
372
373
|
if (fieldType && isTextFieldType(fieldType)) {
|
|
@@ -405,7 +406,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
405
406
|
if (!fieldElement)
|
|
406
407
|
return;
|
|
407
408
|
// Do not update if this field is currently focused.
|
|
408
|
-
if (fieldElement ===
|
|
409
|
+
if (fieldElement === modifiedFieldsContext?.inlineEditingFieldElement) {
|
|
409
410
|
return;
|
|
410
411
|
}
|
|
411
412
|
const fieldId = fieldElement.getAttribute("data-fieldid");
|
|
@@ -499,7 +500,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
499
500
|
context.mode,
|
|
500
501
|
modifiedFieldsContext?.modifiedFields,
|
|
501
502
|
context?.itemsRepository.revision,
|
|
502
|
-
|
|
503
|
+
modifiedFieldsContext?.inlineEditingFieldElement,
|
|
503
504
|
context?.showSuggestedEdits,
|
|
504
505
|
context?.suggestedEdits,
|
|
505
506
|
pageViewContext.pageItemDescriptor,
|
|
@@ -518,7 +519,7 @@ export function InlineEditor({ pageViewContext, compareView, }) {
|
|
|
518
519
|
allFieldEls.forEach(async (el) => {
|
|
519
520
|
// don't stomp on the one that's live‑editing (only in non-preview modes)
|
|
520
521
|
if (context.mode !== "preview" &&
|
|
521
|
-
el ===
|
|
522
|
+
el === modifiedFieldsContext?.inlineEditingFieldElement)
|
|
522
523
|
return;
|
|
523
524
|
const fieldId = el.getAttribute("data-fieldid");
|
|
524
525
|
const itemId = el.getAttribute("data-itemid");
|