@parhelia/core 0.2.12763 → 0.2.12766
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/agents-view/AgentCard.js +6 -8
- package/dist/agents-view/AgentCard.js.map +1 -1
- package/dist/agents-view/AgentsWorkspaceView.js +1 -1
- package/dist/agents-view/AgentsWorkspaceView.js.map +1 -1
- package/dist/config/config.js +2 -1
- package/dist/config/config.js.map +1 -1
- package/dist/editor/ContextMenu.js +36 -6
- package/dist/editor/ContextMenu.js.map +1 -1
- package/dist/editor/Editor.js +21 -1
- package/dist/editor/Editor.js.map +1 -1
- package/dist/editor/ai/terminal/useAgentTextareaDropHandlers.js +35 -7
- package/dist/editor/ai/terminal/useAgentTextareaDropHandlers.js.map +1 -1
- package/dist/editor/client/EditorShell.js +36 -35
- package/dist/editor/client/EditorShell.js.map +1 -1
- package/dist/editor/client/editHistoryReconciliation.d.ts +10 -0
- package/dist/editor/client/editHistoryReconciliation.js +25 -0
- package/dist/editor/client/editHistoryReconciliation.js.map +1 -0
- package/dist/editor/client/operations.js +53 -16
- package/dist/editor/client/operations.js.map +1 -1
- package/dist/editor/client/sidebarAvailability.d.ts +9 -0
- package/dist/editor/client/sidebarAvailability.js +29 -0
- package/dist/editor/client/sidebarAvailability.js.map +1 -0
- package/dist/editor/commands/componentCommands.js +3 -3
- package/dist/editor/menubar/ToolbarFactory.js +1 -1
- package/dist/editor/menubar/ToolbarFactory.js.map +1 -1
- package/dist/editor/menubar/VersionSelector.js +12 -12
- package/dist/editor/menubar/VersionSelector.js.map +1 -1
- package/dist/editor/menubar/toolbar-sections/UtilityControls.d.ts +1 -3
- package/dist/editor/menubar/toolbar-sections/UtilityControls.js +2 -3
- package/dist/editor/menubar/toolbar-sections/UtilityControls.js.map +1 -1
- package/dist/editor/page-viewer/PageViewerFrame.js +74 -38
- package/dist/editor/page-viewer/PageViewerFrame.js.map +1 -1
- package/dist/editor/reviews/EditReviewSettingsDialog.js +18 -59
- package/dist/editor/reviews/EditReviewSettingsDialog.js.map +1 -1
- package/dist/editor/reviews/MultiReviewManager.js +0 -1
- package/dist/editor/reviews/MultiReviewManager.js.map +1 -1
- package/dist/editor/reviews/ReviewCard.d.ts +1 -4
- package/dist/editor/reviews/ReviewCard.js +27 -6
- package/dist/editor/reviews/ReviewCard.js.map +1 -1
- package/dist/editor/reviews/ReviewDetail.js +37 -33
- package/dist/editor/reviews/ReviewDetail.js.map +1 -1
- package/dist/editor/reviews/ReviewItemsPanel.d.ts +1 -3
- package/dist/editor/reviews/ReviewItemsPanel.js +18 -54
- package/dist/editor/reviews/ReviewItemsPanel.js.map +1 -1
- package/dist/editor/reviews/ReviewersPanel.js +39 -3
- package/dist/editor/reviews/ReviewersPanel.js.map +1 -1
- package/dist/editor/reviews/ReviewsList.js +9 -74
- package/dist/editor/reviews/ReviewsList.js.map +1 -1
- package/dist/editor/reviews/reviewListPresentation.d.ts +2 -0
- package/dist/editor/reviews/reviewListPresentation.js +11 -0
- package/dist/editor/reviews/reviewListPresentation.js.map +1 -1
- package/dist/editor/reviews/useMultiReview.d.ts +1 -2
- package/dist/editor/reviews/useMultiReview.js +65 -65
- package/dist/editor/reviews/useMultiReview.js.map +1 -1
- package/dist/editor/services/editService.js +2 -13
- package/dist/editor/services/editService.js.map +1 -1
- package/dist/editor/services/reviewsService.d.ts +1 -4
- package/dist/editor/services/reviewsService.js +1 -6
- package/dist/editor/services/reviewsService.js.map +1 -1
- package/dist/editor/settings/panels/NotificationSubscriptionsPanel.js +15 -12
- package/dist/editor/settings/panels/NotificationSubscriptionsPanel.js.map +1 -1
- package/dist/editor/views/ItemEditor.js +2 -2
- package/dist/editor/views/ItemEditor.js.map +1 -1
- package/dist/revision.d.ts +2 -2
- package/dist/revision.js +2 -2
- package/dist/types.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Editor.js","sourceRoot":"","sources":["../../src/editor/Editor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Editor.js","sourceRoot":"","sources":["../../src/editor/Editor.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AASjE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,UAAU,MAAM,CAAC,EACrB,SAAS,EACT,SAAS,EACT,IAAI,EACJ,QAAQ,GAST;IACC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAuB,CAAC;IAC5D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAY,CAAC;IACrD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAgB,CAAC;IACjE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,EAAoB,CAAC;IAC7E,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5E,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAEhD,SAAS,CAAC,CAAC;IACb,gGAAgG;IAChG,MAAM,QAAQ,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;IAErD,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAExC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE;QAC9C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;YAClC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9D,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACnD,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,0EAA0E;IAC1E,4EAA4E;IAC5E,6EAA6E;IAC7E,wEAAwE;IACxE,6DAA6D;IAC7D,MAAM,wBAAwB,GAAG,WAAW,CAAC,CAAC,IAAU,EAAE,EAAE;QAC1D,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO;QAC1C,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACvD,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YAClD,MAAM,cAAc,GAAG,IAAI,EAAE,CAAC;YAC9B,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACpD,YAAY,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;QACD,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,kDAAkD;QAClD,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC;QAEjC,oDAAoD;QACpD,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC7C,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3C,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC1C,6CAA6C;gBAC7C,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,iBAAiB,CAAC;YAC3C,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnC,gDAAgD;gBAChD,wDAAwD;gBACxD,MAAM,cAAc,GAClB,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;oBACjD,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACpD,IAAI,cAAc,EAAE,CAAC;oBACnB,2DAA2D;oBAC3D,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC;gBACD,yEAAyE;gBACzE,iEAAiE;gBACjE,sDAAsD;YACxD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAChC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,iBAAiB,EAAE;aAChB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAClB,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEL,gBAAgB,EAAE;aACf,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC1D,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,wEAAwE;IACxE,MAAM,iBAAiB,GAAG,YAAY,EAAE,QAAQ,CAAC,IAAI,CACnD,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,QAAQ,KAAK,OAAO;QACtB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC1C,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;YACnC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CACjD,CAAC;IAEF,8DAA8D;IAC9D,MAAM,eAAe,GACnB,CAAC,iBAAiB,IAAI,YAAY,EAAE,aAAa,KAAK,KAAK,CAAC;IAE9D,uFAAuF;IACvF,MAAM,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC3C,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/C,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACjC,iBAAiB,EAAE;aAChB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAClB,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEL,gBAAgB,EAAE;aACf,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC/C,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC1D,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEL,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC7C,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3C,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACzB,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC1C,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,iBAAiB,CAAC;YAC3C,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnC,MAAM,cAAc,GAClB,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;oBACjD,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;oBACjD,KAAK,CAAC;gBACR,kBAAkB,CAAC,cAAc,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,IAAI,aAAa,KAAK,SAAS;YAAE,OAAO;QAEtE,yDAAyD;QACzD,IAAI,iBAAiB,IAAI,eAAe;YAAE,OAAO;QAEjD,MAAM,UAAU,GAAG,SAAS,CAAC;YAC3B,aAAa,EAAE,gBAAgB,CAAC,QAAQ,CAAC;YACzC,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,mBAAmB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC9D,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,EAAE;QACD,QAAQ;QACR,YAAY;QACZ,aAAa;QACb,SAAS;QACT,iBAAiB;QACjB,eAAe;QACf,QAAQ;KACT,CAAC,CAAC;IAEH,qFAAqF;IACrF,gFAAgF;IAChF,IAAI,eAAe,EAAE,CAAC;QACpB,IAAI,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC;YACnC,OAAO,CACL,KAAC,WAAW,IACV,UAAU,EAAE,mBAAmB,EAC/B,aAAa,EAAE,YAAY,CAAC,aAAa,GACzC,CACH,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,OAAO,KAAC,iBAAiB,KAAG,CAAC;QAC/B,CAAC;QACD,wEAAwE;QACxE,gEAAgE;QAChE,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CACL,KAAC,WAAW,IACV,UAAU,EAAE,mBAAmB,EAC/B,aAAa,EAAE,YAAY,CAAC,aAAa,GACzC,CACH,CAAC;QACJ,CAAC;QACD,2DAA2D;QAC3D,OAAO,KAAC,oBAAoB,KAAG,CAAC;IAClC,CAAC;IAED,oFAAoF;IACpF,sFAAsF;IACtF,mEAAmE;IACnE,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACrD,OAAO,KAAC,oBAAoB,KAAG,CAAC;IAClC,CAAC;IAED,wFAAwF;IACxF,+DAA+D;IAC/D,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,CACL,KAAC,eAAe,IACd,oBAAoB,EAAE,aAAa,EACnC,mBAAmB,EAAE,aAAa,IAAI,IAAI,YAE1C,KAAC,cAAc,KAAG,GACF,CACnB,CAAC;IACJ,CAAC;IAED,mFAAmF;IACnF,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAC,oBAAoB,KAAG,CAAC;IAE/C,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,CACL,KAAC,cAAc,IACb,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,IAAI,KAAK,EAC/C,oBAAoB,EAAE,mBAAmB,GACzC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAM;QAAE,OAAO,KAAC,oBAAoB,KAAG,CAAC;IAE7C,OAAO,CACL,KAAC,WAAW,IACV,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,QAAQ,CAAC,WAAW,EACrC,oBAAoB,EAAE,aAAa,EACnC,0BAA0B,EAAE,aAAa,IAAI,IAAI,EACjD,gBAAgB,EAAE,gBAAgB,EAClC,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,CAAC,WAAqC,EAAE,EAAE;YAC5D,MAAM,cAAc,GAAG,EAAE,GAAG,QAAQ,CAAC,WAAW,EAAE,GAAG,WAAW,EAAE,CAAC;YACnE,mBAAmB,CAAC,cAAc,CAAC,CAAC;YACpC,WAAW,CAAC,EAAE,GAAG,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAC;QAC5D,CAAC,YAEA,QAAQ,GACG,CACf,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useCallback, useState } from "react";
|
|
1
|
+
import { useCallback, useEffect, useState } from "react";
|
|
2
2
|
import { useEditContext } from "../../client/editContext";
|
|
3
3
|
import { updateAgentContext, } from "../../services/agentService";
|
|
4
4
|
import { getComponentById } from "../../componentTreeHelper";
|
|
@@ -11,6 +11,32 @@ import { getComponentById } from "../../componentTreeHelper";
|
|
|
11
11
|
export function useAgentTextareaDropHandlers({ agent, agentMetadata, setAgentMetadata, setAgent, documentListRef, documentsEnabled, }) {
|
|
12
12
|
const editContext = useEditContext();
|
|
13
13
|
const [isDragOver, setIsDragOver] = useState(false);
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
const clearDragState = () => setIsDragOver(false);
|
|
16
|
+
const handleKeyDown = (event) => {
|
|
17
|
+
if (event.key === "Escape")
|
|
18
|
+
clearDragState();
|
|
19
|
+
};
|
|
20
|
+
const handleDocumentDragLeave = (event) => {
|
|
21
|
+
// A drag that leaves the browser viewport has no next DOM target. This
|
|
22
|
+
// is especially important for files dragged in from another application,
|
|
23
|
+
// because the browser does not receive a dragend event for those drags.
|
|
24
|
+
if (!event.relatedTarget)
|
|
25
|
+
clearDragState();
|
|
26
|
+
};
|
|
27
|
+
window.addEventListener("blur", clearDragState);
|
|
28
|
+
window.addEventListener("dragend", clearDragState);
|
|
29
|
+
window.addEventListener("drop", clearDragState);
|
|
30
|
+
document.addEventListener("dragleave", handleDocumentDragLeave);
|
|
31
|
+
document.addEventListener("keydown", handleKeyDown);
|
|
32
|
+
return () => {
|
|
33
|
+
window.removeEventListener("blur", clearDragState);
|
|
34
|
+
window.removeEventListener("dragend", clearDragState);
|
|
35
|
+
window.removeEventListener("drop", clearDragState);
|
|
36
|
+
document.removeEventListener("dragleave", handleDocumentDragLeave);
|
|
37
|
+
document.removeEventListener("keydown", handleKeyDown);
|
|
38
|
+
};
|
|
39
|
+
}, []);
|
|
14
40
|
const addComponentIdsToContext = useCallback(async (ids) => {
|
|
15
41
|
if (!agent?.id || !ids?.length)
|
|
16
42
|
return;
|
|
@@ -109,14 +135,16 @@ export function useAgentTextareaDropHandlers({ agent, agentMetadata, setAgentMet
|
|
|
109
135
|
const onDragOver = useCallback((e) => {
|
|
110
136
|
e.preventDefault();
|
|
111
137
|
e.dataTransfer.dropEffect = "copy";
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}, [isDragOver]);
|
|
138
|
+
setIsDragOver(true);
|
|
139
|
+
}, []);
|
|
115
140
|
const onDragEnter = onDragOver;
|
|
116
141
|
const onDragLeave = useCallback((e) => {
|
|
117
|
-
//
|
|
118
|
-
//
|
|
119
|
-
|
|
142
|
+
// dragleave bubbles from child elements, so compare the destination with
|
|
143
|
+
// the wrapper instead of requiring the wrapper to be the event target.
|
|
144
|
+
// When a drag leaves from over the textarea, target is the textarea.
|
|
145
|
+
const nextTarget = e.relatedTarget;
|
|
146
|
+
if (!(nextTarget instanceof Node) ||
|
|
147
|
+
!e.currentTarget.contains(nextTarget)) {
|
|
120
148
|
setIsDragOver(false);
|
|
121
149
|
}
|
|
122
150
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAgentTextareaDropHandlers.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentTextareaDropHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useAgentTextareaDropHandlers.js","sourceRoot":"","sources":["../../../../src/editor/ai/terminal/useAgentTextareaDropHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,10 @@ import { findComponent, getComponentById } from "../componentTreeHelper";
|
|
|
11
11
|
import { getOperationsContext } from "./operations";
|
|
12
12
|
import { handleErrorResult } from "./helpers";
|
|
13
13
|
import { showExpandableErrorToast } from "./errorToast";
|
|
14
|
+
import { isRedoStackEntry, reconcileNewHistoryOperation, } from "./editHistoryReconciliation";
|
|
14
15
|
import { isManualShowMeFocusTransfer, isManualShowMeTarget, } from "./manualShowMeFocus";
|
|
15
16
|
import { isAgentTerminalFocusTransfer, nextAgentTerminalInteractionAt, } from "./agentTerminalFocus";
|
|
17
|
+
import { getAvailableSidebarsForWorkspace } from "./sidebarAvailability";
|
|
16
18
|
import { executeFieldAction as executeFieldServerAction, connectSocket, getEditHistory, getRunningOperations, reconnectSession, releaseFieldLocks, validateItems, } from "../services/editService";
|
|
17
19
|
import { emitAgentDocumentsChanged } from "../services/agentService";
|
|
18
20
|
import { onSocketReconnect as onAgentSocketReconnect } from "../services/agentSubscriptionRegistry";
|
|
@@ -1899,7 +1901,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
1899
1901
|
if (!currentEditOperation.mainItem ||
|
|
1900
1902
|
currentEditOperation.mainItem.id !== currentItem.id ||
|
|
1901
1903
|
currentEditOperation.mainItem.language !== currentItem.language) {
|
|
1902
|
-
return history; // Don't add - doesn't match page-centric filter
|
|
1904
|
+
return reconcileNewHistoryOperation(history, currentEditOperation, false); // Don't add - doesn't match page-centric filter
|
|
1903
1905
|
}
|
|
1904
1906
|
}
|
|
1905
1907
|
if (currentHistoryMode === "current-version" && currentItem) {
|
|
@@ -1908,13 +1910,13 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
1908
1910
|
currentEditOperation.mainItem.id !== currentItem.id ||
|
|
1909
1911
|
currentEditOperation.mainItem.language !== currentItem.language ||
|
|
1910
1912
|
currentEditOperation.mainItem.version !== currentItem.version) {
|
|
1911
|
-
return history; // Don't add - doesn't match current-version filter
|
|
1913
|
+
return reconcileNewHistoryOperation(history, currentEditOperation, false); // Don't add - doesn't match current-version filter
|
|
1912
1914
|
}
|
|
1913
1915
|
}
|
|
1914
1916
|
if (!matchesHistorySearchQuery(currentEditOperation)) {
|
|
1915
|
-
return history;
|
|
1917
|
+
return reconcileNewHistoryOperation(history, currentEditOperation, false);
|
|
1916
1918
|
}
|
|
1917
|
-
return
|
|
1919
|
+
return reconcileNewHistoryOperation(history, currentEditOperation, true);
|
|
1918
1920
|
});
|
|
1919
1921
|
}, [matchesHistorySearchQuery]);
|
|
1920
1922
|
useEffect(() => {
|
|
@@ -2136,7 +2138,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
2136
2138
|
if (!prev.length)
|
|
2137
2139
|
return sortEditHistoryByDateDesc(next);
|
|
2138
2140
|
if (!next.length)
|
|
2139
|
-
return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op)));
|
|
2141
|
+
return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op) && !isRedoStackEntry(op)));
|
|
2140
2142
|
const prevById = new Map(prev.map((x) => [x.id, x]));
|
|
2141
2143
|
const nextById = new Set(next.map((x) => x.id));
|
|
2142
2144
|
const merged = next
|
|
@@ -2176,7 +2178,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
2176
2178
|
});
|
|
2177
2179
|
// Preserve operations that arrived via WebSocket during the fetch window
|
|
2178
2180
|
for (const [id, priorOp] of prevById) {
|
|
2179
|
-
if (!nextById.has(id) &&
|
|
2181
|
+
if (!nextById.has(id) &&
|
|
2182
|
+
matchesHistoryScope(priorOp) &&
|
|
2183
|
+
!isRedoStackEntry(priorOp)) {
|
|
2180
2184
|
merged.push(priorOp);
|
|
2181
2185
|
}
|
|
2182
2186
|
}
|
|
@@ -2261,7 +2265,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
2261
2265
|
// When searching, respect the empty result — don't fall back to previous items
|
|
2262
2266
|
if (historyQuery)
|
|
2263
2267
|
return [];
|
|
2264
|
-
return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope)));
|
|
2268
|
+
return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope) && !isRedoStackEntry(op)));
|
|
2265
2269
|
}
|
|
2266
2270
|
const prevById = new Map(prev.map((x) => [x.id, x]));
|
|
2267
2271
|
const nextById = new Set(next.map((x) => x.id));
|
|
@@ -2301,7 +2305,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
2301
2305
|
// but not when filtering by search query — search results are authoritative
|
|
2302
2306
|
if (!historyQuery) {
|
|
2303
2307
|
for (const [id, priorOp] of prevById) {
|
|
2304
|
-
if (!nextById.has(id) &&
|
|
2308
|
+
if (!nextById.has(id) &&
|
|
2309
|
+
matchesHistoryScope(priorOp, scope) &&
|
|
2310
|
+
!isRedoStackEntry(priorOp)) {
|
|
2305
2311
|
merged.push(priorOp);
|
|
2306
2312
|
}
|
|
2307
2313
|
}
|
|
@@ -2367,7 +2373,7 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
2367
2373
|
if (!operations.length) {
|
|
2368
2374
|
if (historyQuery)
|
|
2369
2375
|
return [];
|
|
2370
|
-
return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope)));
|
|
2376
|
+
return sortEditHistoryByDateDesc(prev.filter((op) => matchesHistoryScope(op, scope) && !isRedoStackEntry(op)));
|
|
2371
2377
|
}
|
|
2372
2378
|
const prevById = new Map(prev.map((x) => [x.id, x]));
|
|
2373
2379
|
const nextById = new Set(operations.map((x) => x.id));
|
|
@@ -2407,7 +2413,9 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
2407
2413
|
// but not when filtering by search query — search results are authoritative
|
|
2408
2414
|
if (!historyQuery) {
|
|
2409
2415
|
for (const [id, priorOp] of prevById) {
|
|
2410
|
-
if (!nextById.has(id) &&
|
|
2416
|
+
if (!nextById.has(id) &&
|
|
2417
|
+
matchesHistoryScope(priorOp, scope) &&
|
|
2418
|
+
!isRedoStackEntry(priorOp)) {
|
|
2411
2419
|
merged.push(priorOp);
|
|
2412
2420
|
}
|
|
2413
2421
|
}
|
|
@@ -3249,15 +3257,17 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
3249
3257
|
const scopeMatches = matchesHistoryScope(op);
|
|
3250
3258
|
if (!scopeMatches && !isDeleteOperation) {
|
|
3251
3259
|
// Operation doesn't match current scope, don't add to history
|
|
3252
|
-
return prev;
|
|
3260
|
+
return reconcileNewHistoryOperation(prev, op, false);
|
|
3253
3261
|
}
|
|
3254
3262
|
// Mirror the backend search filter so live updates don't bypass an
|
|
3255
3263
|
// active search query.
|
|
3256
3264
|
if (!matchesHistorySearchQuery(op)) {
|
|
3257
|
-
return prev;
|
|
3265
|
+
return reconcileNewHistoryOperation(prev, op, false);
|
|
3258
3266
|
}
|
|
3259
|
-
//
|
|
3260
|
-
|
|
3267
|
+
// The backend deletes this session's undone operations whenever a new
|
|
3268
|
+
// operation is persisted. Mirror that redo-stack invalidation locally
|
|
3269
|
+
// so the toolbar never targets an operation that no longer exists.
|
|
3270
|
+
return sortEditHistoryByDateDesc(reconcileNewHistoryOperation(prev, op, true));
|
|
3261
3271
|
});
|
|
3262
3272
|
}, [
|
|
3263
3273
|
matchesHistoryScope,
|
|
@@ -3781,27 +3791,18 @@ export function EditorShell({ configuration, className, item: loadItemDescriptor
|
|
|
3781
3791
|
// Get resolved sidebar (with panels materialized)
|
|
3782
3792
|
// Note: This is defined as a function that will be called later when editContext is available
|
|
3783
3793
|
const sidebars = configuration.editor.sidebars ?? [];
|
|
3784
|
-
const getSidebarsForWorkspace = useCallback((targetWorkspaceId) => {
|
|
3785
|
-
|
|
3786
|
-
|
|
3787
|
-
|
|
3788
|
-
|
|
3789
|
-
|
|
3790
|
-
|
|
3791
|
-
|
|
3792
|
-
|
|
3793
|
-
|
|
3794
|
-
|
|
3795
|
-
|
|
3796
|
-
if (!hasBackendWorkspaceSettings) {
|
|
3797
|
-
return true;
|
|
3798
|
-
}
|
|
3799
|
-
if (!workspaceSettings) {
|
|
3800
|
-
return false;
|
|
3801
|
-
}
|
|
3802
|
-
return allowedSidebarIds.includes(s.id);
|
|
3803
|
-
});
|
|
3804
|
-
}, [configuration.editor.workspaces, sidebars, userInfo.workspaces]);
|
|
3794
|
+
const getSidebarsForWorkspace = useCallback((targetWorkspaceId) => getAvailableSidebarsForWorkspace({
|
|
3795
|
+
sidebars,
|
|
3796
|
+
workspaces: configuration.editor.workspaces,
|
|
3797
|
+
userWorkspaces: userInfo.workspaces,
|
|
3798
|
+
targetWorkspaceId,
|
|
3799
|
+
isLimitedPreviewUser: userInfo.user?.isLimitedPreviewUser ?? false,
|
|
3800
|
+
}), [
|
|
3801
|
+
configuration.editor.workspaces,
|
|
3802
|
+
sidebars,
|
|
3803
|
+
userInfo.user?.isLimitedPreviewUser,
|
|
3804
|
+
userInfo.workspaces,
|
|
3805
|
+
]);
|
|
3805
3806
|
const getResolvedSidebar = useCallback((sidebarId) => {
|
|
3806
3807
|
const sidebar = getSidebarsForWorkspace(workspaceId).find((s) => s.id === sidebarId);
|
|
3807
3808
|
if (!sidebar)
|