@rowsncolumns/ui 15.0.43 → 16.0.1
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/cjs/editor/suggestions-dropdown.d.ts +7 -1
- package/dist/cjs/editor/suggestions-dropdown.d.ts.map +1 -1
- package/dist/cjs/editor/suggestions-dropdown.js +9 -8
- package/dist/cjs/editor-pm/helpers.d.ts +3 -1
- package/dist/cjs/editor-pm/helpers.d.ts.map +1 -1
- package/dist/cjs/editor-pm/helpers.js +5 -2
- package/dist/cjs/editor-pm/prosemirror-editor.d.ts +25 -0
- package/dist/cjs/editor-pm/prosemirror-editor.d.ts.map +1 -1
- package/dist/cjs/editor-pm/prosemirror-editor.js +28 -2
- package/dist/cjs/editor-pm/schema.d.ts.map +1 -1
- package/dist/cjs/editor-pm/schema.js +8 -1
- package/dist/cjs/editor-pm/use-dropdown-change-pm.d.ts.map +1 -1
- package/dist/cjs/editor-pm/use-dropdown-change-pm.js +15 -1
- package/dist/cjs/editor-pm/use-editor-change-pm.d.ts +3 -1
- package/dist/cjs/editor-pm/use-editor-change-pm.d.ts.map +1 -1
- package/dist/cjs/editor-pm/use-editor-change-pm.js +3 -2
- package/dist/cjs/function-info/helpers.d.ts +3 -2
- package/dist/cjs/function-info/helpers.d.ts.map +1 -1
- package/dist/cjs/function-info/helpers.js +9 -4
- package/dist/cjs/function-info/index.d.ts +2 -0
- package/dist/cjs/function-info/index.d.ts.map +1 -1
- package/dist/cjs/function-info/index.js +8 -8
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/esm/editor/suggestions-dropdown.d.ts +7 -1
- package/dist/esm/editor/suggestions-dropdown.d.ts.map +1 -1
- package/dist/esm/editor/suggestions-dropdown.js +8 -5
- package/dist/esm/editor-pm/helpers.d.ts +3 -1
- package/dist/esm/editor-pm/helpers.d.ts.map +1 -1
- package/dist/esm/editor-pm/helpers.js +4 -2
- package/dist/esm/editor-pm/prosemirror-editor.d.ts +25 -0
- package/dist/esm/editor-pm/prosemirror-editor.d.ts.map +1 -1
- package/dist/esm/editor-pm/prosemirror-editor.js +20 -2
- package/dist/esm/editor-pm/schema.d.ts.map +1 -1
- package/dist/esm/editor-pm/schema.js +8 -1
- package/dist/esm/editor-pm/use-dropdown-change-pm.d.ts.map +1 -1
- package/dist/esm/editor-pm/use-dropdown-change-pm.js +15 -1
- package/dist/esm/editor-pm/use-editor-change-pm.d.ts +3 -1
- package/dist/esm/editor-pm/use-editor-change-pm.d.ts.map +1 -1
- package/dist/esm/editor-pm/use-editor-change-pm.js +3 -2
- package/dist/esm/function-info/helpers.d.ts +3 -2
- package/dist/esm/function-info/helpers.d.ts.map +1 -1
- package/dist/esm/function-info/helpers.js +6 -4
- package/dist/esm/function-info/index.d.ts +2 -0
- package/dist/esm/function-info/index.d.ts.map +1 -1
- package/dist/esm/function-info/index.js +7 -7
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +13 -10
- package/dist/cjs/editor-pm/use-parameter-suggestions.test.d.ts +0 -2
- package/dist/cjs/editor-pm/use-parameter-suggestions.test.d.ts.map +0 -1
- package/dist/cjs/editor-pm/use-parameter-suggestions.test.js +0 -122
- package/dist/esm/editor-pm/use-parameter-suggestions.test.d.ts +0 -2
- package/dist/esm/editor-pm/use-parameter-suggestions.test.d.ts.map +0 -1
- package/dist/esm/editor-pm/use-parameter-suggestions.test.js +0 -66
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../editor-pm/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../editor-pm/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -932,7 +932,9 @@ export const getParameterIndex = (curToken, functionToken, tokens) => {
|
|
|
932
932
|
}
|
|
933
933
|
return count;
|
|
934
934
|
};
|
|
935
|
-
export const getFunctionParameters = (input, functionToken
|
|
935
|
+
export const getFunctionParameters = (input, functionToken,
|
|
936
|
+
/** The formula locale's argument separator the input was typed with (`,` canonical). */
|
|
937
|
+
argumentSeparator = ",") => {
|
|
936
938
|
if (!functionToken) {
|
|
937
939
|
return { parameters: [], ranges: [] };
|
|
938
940
|
}
|
|
@@ -983,7 +985,7 @@ export const getFunctionParameters = (input, functionToken) => {
|
|
|
983
985
|
for (let i = 0; i <= argsSlice.length; i++) {
|
|
984
986
|
const ch = argsSlice[i];
|
|
985
987
|
if (i === argsSlice.length ||
|
|
986
|
-
(ch ===
|
|
988
|
+
(ch === argumentSeparator &&
|
|
987
989
|
paren === 0 &&
|
|
988
990
|
brace === 0 &&
|
|
989
991
|
bracket === 0 &&
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ParsedToken } from "@rowsncolumns/calculator";
|
|
2
2
|
import type { CalculatorFunction, Mention } from "@rowsncolumns/common-types";
|
|
3
|
+
import { type FormulaLocale } from "@rowsncolumns/utils";
|
|
3
4
|
import React from "react";
|
|
4
5
|
import { Command } from "prosemirror-state";
|
|
5
6
|
import { type RunColorResolver } from "./helpers";
|
|
@@ -44,6 +45,14 @@ export type ProseMirrorEditorProps<M extends Mention = Mention> = RichTextEditor
|
|
|
44
45
|
formulaMode?: boolean;
|
|
45
46
|
isActive?: boolean;
|
|
46
47
|
tokenizer(value: string): ParsedToken[];
|
|
48
|
+
/**
|
|
49
|
+
* The formula locale the editor text is written in (rowsncolumns/spreadsheet#655): the locale's
|
|
50
|
+
* argument separator splits the argument hints, and the function names the host callbacks
|
|
51
|
+
* (`getFunctionParameterSuggestions`, `shouldFetchFunctionParameters`) receive are canonical
|
|
52
|
+
* (English) whatever the user typed. `tokenizer` and `functionDescriptions` are expected to be
|
|
53
|
+
* in the same locale. Canonical syntax when omitted.
|
|
54
|
+
*/
|
|
55
|
+
formulaLocale?: FormulaLocale;
|
|
47
56
|
showDropdown?: boolean;
|
|
48
57
|
dropdownStyles?: React.CSSProperties;
|
|
49
58
|
stickyEditor?: boolean;
|
|
@@ -232,6 +241,14 @@ export declare const ProseMirrorEditorThatMayError: React.NamedExoticComponent<R
|
|
|
232
241
|
* @param value
|
|
233
242
|
*/
|
|
234
243
|
tokenizer(value: string): ParsedToken[];
|
|
244
|
+
/**
|
|
245
|
+
* The formula locale the editor text is written in (rowsncolumns/spreadsheet#655): the locale's
|
|
246
|
+
* argument separator splits the argument hints, and the function names the host callbacks
|
|
247
|
+
* (`getFunctionParameterSuggestions`, `shouldFetchFunctionParameters`) receive are canonical
|
|
248
|
+
* (English) whatever the user typed. `tokenizer` and `functionDescriptions` are expected to be
|
|
249
|
+
* in the same locale. Canonical syntax when omitted.
|
|
250
|
+
*/
|
|
251
|
+
formulaLocale?: FormulaLocale;
|
|
235
252
|
showDropdown?: boolean;
|
|
236
253
|
dropdownStyles?: React.CSSProperties;
|
|
237
254
|
stickyEditor?: boolean;
|
|
@@ -372,6 +389,14 @@ export declare const ProseMirrorEditor: React.ForwardRefExoticComponent<Omit<Ric
|
|
|
372
389
|
* @param value
|
|
373
390
|
*/
|
|
374
391
|
tokenizer(value: string): ParsedToken[];
|
|
392
|
+
/**
|
|
393
|
+
* The formula locale the editor text is written in (rowsncolumns/spreadsheet#655): the locale's
|
|
394
|
+
* argument separator splits the argument hints, and the function names the host callbacks
|
|
395
|
+
* (`getFunctionParameterSuggestions`, `shouldFetchFunctionParameters`) receive are canonical
|
|
396
|
+
* (English) whatever the user typed. `tokenizer` and `functionDescriptions` are expected to be
|
|
397
|
+
* in the same locale. Canonical syntax when omitted.
|
|
398
|
+
*/
|
|
399
|
+
formulaLocale?: FormulaLocale;
|
|
375
400
|
showDropdown?: boolean;
|
|
376
401
|
dropdownStyles?: React.CSSProperties;
|
|
377
402
|
stickyEditor?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosemirror-editor.d.ts","sourceRoot":"","sources":["../../../editor-pm/prosemirror-editor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"prosemirror-editor.d.ts","sourceRoot":"","sources":["../../../editor-pm/prosemirror-editor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { LoadingIcon, QuestionMarkIcon } from "@rowsncolumns/icons";
|
|
2
|
+
import { canonicalizeFunctionName } from "@rowsncolumns/utils";
|
|
2
3
|
import { addressToCell, getHotkeyKey, isAFormula, isNil, log, } from "@rowsncolumns/utils";
|
|
3
4
|
import React, { forwardRef, memo, useCallback, useImperativeHandle, useMemo, useRef, useState, } from "react";
|
|
4
5
|
import { history, undo, redo } from "prosemirror-history";
|
|
@@ -58,10 +59,26 @@ export const deleteAll = (state, dispatch) => {
|
|
|
58
59
|
* ProseMirror editor component for rich text and formula editing.
|
|
59
60
|
* Supports syntax highlighting, autocomplete, and keyboard shortcuts.
|
|
60
61
|
*/
|
|
61
|
-
export const ProseMirrorEditorThatMayError = memo(forwardRef(({ value = "", isNewValue, formulaMode, onChange, autoFocus, className, onKeyDown, disabled, showDropdown = true, persistFocus = true, editorZeroOutline, showFormulaHelp, onHideFormulaHelp, onShowFormulaHelp, tokenizer, onCancel, onSubmit, onFormulaStateChange, dropdownStyles, options, isOptionSelected, functionDescriptions, shouldFetchFunctionParameters, getFunctionParameterSuggestions, getMentions, getNamedRanges, getTableNames, getTableColumnNames, getStructuredProperties, onTeardown, SuggestionsDropdown = DefaultSuggestionsDropdown, MentionTagComponent, MentionDropdownItemComponent, isActive, stickyEditor = true, onFocus, onBlur, onCopy, onCut, onPaste, placeholder, textFormatRuns, resolveRunColor, navigationMode, enableContinuousSelection, cellFontFamily, ...props }, forwardedRef) => {
|
|
62
|
+
export const ProseMirrorEditorThatMayError = memo(forwardRef(({ value = "", isNewValue, formulaMode, onChange, autoFocus, className, onKeyDown, disabled, showDropdown = true, persistFocus = true, editorZeroOutline, showFormulaHelp, onHideFormulaHelp, onShowFormulaHelp, tokenizer, onCancel, onSubmit, onFormulaStateChange, dropdownStyles, options, isOptionSelected, functionDescriptions, shouldFetchFunctionParameters: shouldFetchFunctionParametersProp, getFunctionParameterSuggestions: getFunctionParameterSuggestionsProp, formulaLocale, getMentions, getNamedRanges, getTableNames, getTableColumnNames, getStructuredProperties, onTeardown, SuggestionsDropdown = DefaultSuggestionsDropdown, MentionTagComponent, MentionDropdownItemComponent, isActive, stickyEditor = true, onFocus, onBlur, onCopy, onCut, onPaste, placeholder, textFormatRuns, resolveRunColor, navigationMode, enableContinuousSelection, cellFontFamily, ...props }, forwardedRef) => {
|
|
62
63
|
const editorRef = useRef(null);
|
|
63
64
|
const viewRef = useRef(null);
|
|
64
65
|
const cellFontFamilyRef = useRef(cellFontFamily);
|
|
66
|
+
// The function token is in the editor's locale (`СУММ(`); hosts are asked about the canonical
|
|
67
|
+
// name (`SUM(`) so parameter providers keyed on English names work in every locale.
|
|
68
|
+
const canonicalFunctionImage = useCallback((image) => {
|
|
69
|
+
if (!formulaLocale || formulaLocale.isCanonical)
|
|
70
|
+
return image;
|
|
71
|
+
const hasParen = image.endsWith("(");
|
|
72
|
+
const name = hasParen ? image.slice(0, -1) : image;
|
|
73
|
+
return canonicalizeFunctionName(name, formulaLocale) + (hasParen ? "(" : "");
|
|
74
|
+
}, [formulaLocale]);
|
|
75
|
+
const needsCanonicalNames = Boolean(formulaLocale && !formulaLocale.isCanonical);
|
|
76
|
+
const shouldFetchFunctionParameters = useMemo(() => needsCanonicalNames && shouldFetchFunctionParametersProp
|
|
77
|
+
? (functionName, parameterIndex, parameters) => shouldFetchFunctionParametersProp(canonicalFunctionImage(functionName), parameterIndex, parameters)
|
|
78
|
+
: shouldFetchFunctionParametersProp, [needsCanonicalNames, shouldFetchFunctionParametersProp, canonicalFunctionImage]);
|
|
79
|
+
const getFunctionParameterSuggestions = useMemo(() => needsCanonicalNames && getFunctionParameterSuggestionsProp
|
|
80
|
+
? (functionName, parameterIndex, parameters) => getFunctionParameterSuggestionsProp(canonicalFunctionImage(functionName), parameterIndex, parameters)
|
|
81
|
+
: getFunctionParameterSuggestionsProp, [needsCanonicalNames, getFunctionParameterSuggestionsProp, canonicalFunctionImage]);
|
|
65
82
|
const [cursorPosition, setCursorPosition] = useState();
|
|
66
83
|
const [tableToken, setTableToken] = useState();
|
|
67
84
|
const [functionToken, setFunctionToken] = useState();
|
|
@@ -264,6 +281,7 @@ export const ProseMirrorEditorThatMayError = memo(forwardRef(({ value = "", isNe
|
|
|
264
281
|
},
|
|
265
282
|
onChangePreviousToken: setPreviousToken,
|
|
266
283
|
enableContinuousSelection: enableContinuousSelection ?? isNil(navigationMode),
|
|
284
|
+
argumentSeparator: formulaLocale?.argumentSeparator,
|
|
267
285
|
});
|
|
268
286
|
// Initialize editor
|
|
269
287
|
useIsomorphicLayoutEffect(() => {
|
|
@@ -1124,7 +1142,7 @@ export const ProseMirrorEditorThatMayError = memo(forwardRef(({ value = "", isNe
|
|
|
1124
1142
|
} })),
|
|
1125
1143
|
showDropdownEffective && isDropdownOpen && (React.createElement(ConditionalWrapper, { condition: stickyEditor, wrapper: (children) => React.createElement(Portal, { asChild: true }, children) },
|
|
1126
1144
|
React.createElement(Popper.Content, { side: "bottom", align: "start", className: "z-50", sideOffset: 2 },
|
|
1127
|
-
React.createElement(SuggestionsDropdown, { functionDescriptions: functionDescriptions, formulaMode: formulaMode, dropdownStyles: dropdownStyles, functionToken: functionToken, parameterIndex: parameterIndex, items: items, highlightedIndex: highlightedIndex, onSelect: onSelect, onChangeHighlightedIndex: onChangeHighlightedIndex, showFormulaHelp: showFormulaHelp, onHideFormulaHelp: onHideFormulaHelp })))),
|
|
1145
|
+
React.createElement(SuggestionsDropdown, { functionDescriptions: functionDescriptions, formulaMode: formulaMode, dropdownStyles: dropdownStyles, functionToken: functionToken, parameterIndex: parameterIndex, items: items, highlightedIndex: highlightedIndex, onSelect: onSelect, onChangeHighlightedIndex: onChangeHighlightedIndex, showFormulaHelp: showFormulaHelp, onHideFormulaHelp: onHideFormulaHelp, formulaLocale: formulaLocale })))),
|
|
1128
1146
|
showDropdownEffective && showMentionDropdownEffective && (React.createElement(ConditionalWrapper, { condition: stickyEditor, wrapper: (children) => React.createElement(Portal, { asChild: true }, children) },
|
|
1129
1147
|
React.createElement(Popper.Content, { side: "bottom", align: "start", className: "z-50", sideOffset: 2 },
|
|
1130
1148
|
React.createElement(MentionsDropdown, { mentions: mentions, onSelect: handleInsertMention, highlightedIndex: mentionHighlightedIndex, isFetchingMentions: isFetchingMentions, MentionDropdownItemComponent: MentionDropdownItemComponent }))))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../editor-pm/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,eAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../editor-pm/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,eAAO,MAAM,MAAM,oKA0LjB,CAAC"}
|
|
@@ -125,10 +125,17 @@ export const schema = new Schema({
|
|
|
125
125
|
},
|
|
126
126
|
parseDOM: [{ tag: "sub" }, { style: "vertical-align=sub" }],
|
|
127
127
|
},
|
|
128
|
+
// Per-run text color (`TextFormat.color`). The `data-run-color` attribute lets a host
|
|
129
|
+
// (the formula bar) suppress run colors without touching the formula-syntax highlighting,
|
|
130
|
+
// which ProseMirror also paints as `<span style="color: …">` inline decorations.
|
|
128
131
|
color: {
|
|
129
132
|
attrs: { color: {} },
|
|
130
133
|
toDOM(mark) {
|
|
131
|
-
return [
|
|
134
|
+
return [
|
|
135
|
+
"span",
|
|
136
|
+
{ style: `color: ${mark.attrs.color}`, "data-run-color": "" },
|
|
137
|
+
0,
|
|
138
|
+
];
|
|
132
139
|
},
|
|
133
140
|
parseDOM: [
|
|
134
141
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-dropdown-change-pm.d.ts","sourceRoot":"","sources":["../../../editor-pm/use-dropdown-change-pm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGpD,KAAK,UAAU,GAAG;IAChB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC;IACxC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,IAAI,UAAU,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,aAAa,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;IACxE,eAAe,EAAE,WAAW,GAAG,SAAS,CAAC;IACzC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,aAAa,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,cAAc,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAC5D,aAAa,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,OAAO,WAAW,GAAG,SAAS,EAC9B,SAAS,MAAM,EACf,aAAa,MAAM;;;QAkBpB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,+HAUjC,UAAU,YAEF,UAAU,
|
|
1
|
+
{"version":3,"file":"use-dropdown-change-pm.d.ts","sourceRoot":"","sources":["../../../editor-pm/use-dropdown-change-pm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGpD,KAAK,UAAU,GAAG;IAChB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC;IACxC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,IAAI,UAAU,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,aAAa,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;IACxE,eAAe,EAAE,WAAW,GAAG,SAAS,CAAC;IACzC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,aAAa,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,cAAc,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAC5D,aAAa,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,OAAO,WAAW,GAAG,SAAS,EAC9B,SAAS,MAAM,EACf,aAAa,MAAM;;;QAkBpB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,+HAUjC,UAAU,YAEF,UAAU,SAsKpB,CAAC"}
|
|
@@ -99,8 +99,22 @@ export const useDropdownChangePM = ({ itemToString, formulaMode, getView, onSubm
|
|
|
99
99
|
case "thisrow":
|
|
100
100
|
textToInsert = "@";
|
|
101
101
|
break;
|
|
102
|
+
case "specialitem": {
|
|
103
|
+
const prevChar = insertPos > 0
|
|
104
|
+
? state.doc.textBetween(insertPos - 1, insertPos)
|
|
105
|
+
: "";
|
|
106
|
+
// Excel's autocomplete inserts a special item in its two-part form: at `Table[` the
|
|
107
|
+
// pick becomes `Table[[#Headers],` and the column list follows; inside an open
|
|
108
|
+
// two-part form (`Table[[#Headers],`) it is bracketed like a column.
|
|
109
|
+
textToInsert =
|
|
110
|
+
prevChar === "["
|
|
111
|
+
? `[${value}],`
|
|
112
|
+
: prevChar === ","
|
|
113
|
+
? `[${value}]`
|
|
114
|
+
: value;
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
102
117
|
case "namedrange":
|
|
103
|
-
case "specialitem":
|
|
104
118
|
case "parameter":
|
|
105
119
|
textToInsert = value;
|
|
106
120
|
break;
|
|
@@ -23,7 +23,9 @@ type UseEditorOnChangePMProps = {
|
|
|
23
23
|
end: number;
|
|
24
24
|
}[]): void;
|
|
25
25
|
onChangePreviousToken(token: ParsedToken | undefined): void;
|
|
26
|
+
/** Argument separator of the formula locale the editor text is written in (`,` canonical). */
|
|
27
|
+
argumentSeparator?: string;
|
|
26
28
|
};
|
|
27
|
-
export declare const useEditorOnChangePM: ({ onChange, getView, isActive, enableContinuousSelection, tokenizer, onChangeCursor, onChangeActiveToken, onFormulaStateChange, onSuggestionTokenChange, onTableTokenChange, onChangeFunctionToken, onChangeParameterIndex, onCellPropertyTokenChange, onChangeFunctionParameters, onChangeIsEdgeOfCell, onChangePreviousToken, }: UseEditorOnChangePMProps) => (newState: EditorState) => void;
|
|
29
|
+
export declare const useEditorOnChangePM: ({ onChange, getView, isActive, enableContinuousSelection, tokenizer, onChangeCursor, onChangeActiveToken, onFormulaStateChange, onSuggestionTokenChange, onTableTokenChange, onChangeFunctionToken, onChangeParameterIndex, onCellPropertyTokenChange, onChangeFunctionParameters, onChangeIsEdgeOfCell, onChangePreviousToken, argumentSeparator, }: UseEditorOnChangePMProps) => (newState: EditorState) => void;
|
|
28
30
|
export {};
|
|
29
31
|
//# sourceMappingURL=use-editor-change-pm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-editor-change-pm.d.ts","sourceRoot":"","sources":["../../../editor-pm/use-editor-change-pm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAyBnE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxC,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,aAAa,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;IACvE,OAAO,IAAI,UAAU,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACnD,mBAAmB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1D,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAC;IACxC,oBAAoB,EAAE,sBAAsB,CAAC,sBAAsB,CAAC,CAAC;IACrE,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC9D,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IACzD,qBAAqB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC5D,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,oBAAoB,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IAClD,yBAAyB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,0BAA0B,CAAC,CACzB,MAAM,EAAE,MAAM,EAAE,EAChB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,GACvC,IAAI,CAAC;IACR,qBAAqB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"use-editor-change-pm.d.ts","sourceRoot":"","sources":["../../../editor-pm/use-editor-change-pm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAyBnE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxC,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,aAAa,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;IACvE,OAAO,IAAI,UAAU,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACnD,mBAAmB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1D,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAC;IACxC,oBAAoB,EAAE,sBAAsB,CAAC,sBAAsB,CAAC,CAAC;IACrE,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC9D,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IACzD,qBAAqB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC5D,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,oBAAoB,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IAClD,yBAAyB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAChE,0BAA0B,CAAC,CACzB,MAAM,EAAE,MAAM,EAAE,EAChB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,GACvC,IAAI,CAAC;IACR,qBAAqB,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC;IAC5D,8FAA8F;IAC9F,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,sVAkBjC,wBAAwB,gBAWV,WAAW,SAsN3B,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { useCallback, useEffect, useRef } from "react";
|
|
|
4
4
|
import { enableCellSelection, extractTextFormatRuns, getActiveFunctionToken, getActiveSelectionIndex, getActiveSuggestionToken, getActiveTableToken, getActiveToken, getCursorPosition, getFunctionParameters, getParameterIndex, getTokenizationContent, getPreviousToken, hasPropertyReference, isCellToken, isNamedRangeToken, isTableColumnToken, isTableNameToken, resolveCellPropertyToken, serializeEditorValue, getTokenBeforeCaret, isUnknownToken, } from "./helpers";
|
|
5
5
|
import { useCallbackRef } from "@rowsncolumns/grid";
|
|
6
6
|
import { CELL_SUGGESTION_PREFIX } from "../editor/constants";
|
|
7
|
-
export const useEditorOnChangePM = ({ onChange, getView, isActive, enableContinuousSelection, tokenizer, onChangeCursor, onChangeActiveToken, onFormulaStateChange, onSuggestionTokenChange, onTableTokenChange, onChangeFunctionToken, onChangeParameterIndex, onCellPropertyTokenChange, onChangeFunctionParameters, onChangeIsEdgeOfCell, onChangePreviousToken, }) => {
|
|
7
|
+
export const useEditorOnChangePM = ({ onChange, getView, isActive, enableContinuousSelection, tokenizer, onChangeCursor, onChangeActiveToken, onFormulaStateChange, onSuggestionTokenChange, onTableTokenChange, onChangeFunctionToken, onChangeParameterIndex, onCellPropertyTokenChange, onChangeFunctionParameters, onChangeIsEdgeOfCell, onChangePreviousToken, argumentSeparator, }) => {
|
|
8
8
|
const lastSeenCursorTokenRef = useRef(undefined);
|
|
9
9
|
useEffect(() => {
|
|
10
10
|
if (!isActive) {
|
|
@@ -93,7 +93,7 @@ export const useEditorOnChangePM = ({ onChange, getView, isActive, enableContinu
|
|
|
93
93
|
}
|
|
94
94
|
// Get function parameters
|
|
95
95
|
const parameterIndex = getParameterIndex(tokenForFunction, functionToken, tokens);
|
|
96
|
-
const { parameters, ranges } = getFunctionParameters(line, functionToken);
|
|
96
|
+
const { parameters, ranges } = getFunctionParameters(line, functionToken, argumentSeparator);
|
|
97
97
|
// Cursor position to show cell suggestion
|
|
98
98
|
onChangeCursor(canSelectCells ? cursorPos : undefined);
|
|
99
99
|
// Active token
|
|
@@ -152,5 +152,6 @@ export const useEditorOnChangePM = ({ onChange, getView, isActive, enableContinu
|
|
|
152
152
|
onChangeParameterIndex,
|
|
153
153
|
onCellPropertyTokenChange,
|
|
154
154
|
onChangeFunctionParameters,
|
|
155
|
+
argumentSeparator,
|
|
155
156
|
]));
|
|
156
157
|
};
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Tokenizes function syntax
|
|
2
|
+
* Tokenizes function syntax. `argumentSeparator` is the locale's argument separator the syntax
|
|
3
|
+
* was written with (`,` for the canonical catalog, `;` for a `localizeFunctionSyntax` result).
|
|
3
4
|
* @param syntax
|
|
4
5
|
*/
|
|
5
|
-
export declare const tokenizeFunctionSyntax: (syntax: string) => {
|
|
6
|
+
export declare const tokenizeFunctionSyntax: (syntax: string, argumentSeparator?: string) => {
|
|
6
7
|
functionOpen: string;
|
|
7
8
|
parameters: string[];
|
|
8
9
|
functionClose: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../function-info/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../function-info/helpers.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,EAAE,0BAAuB;;;;CAoB7E,CAAC"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
+
const escapeForRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
1
2
|
/**
|
|
2
|
-
* Tokenizes function syntax
|
|
3
|
+
* Tokenizes function syntax. `argumentSeparator` is the locale's argument separator the syntax
|
|
4
|
+
* was written with (`,` for the canonical catalog, `;` for a `localizeFunctionSyntax` result).
|
|
3
5
|
* @param syntax
|
|
4
6
|
*/
|
|
5
|
-
export const tokenizeFunctionSyntax = (syntax) => {
|
|
7
|
+
export const tokenizeFunctionSyntax = (syntax, argumentSeparator = ",") => {
|
|
6
8
|
const openParen = "(";
|
|
7
9
|
const closeParen = ")";
|
|
8
10
|
const index = syntax.indexOf(openParen) + 1;
|
|
9
11
|
const functionOpen = syntax.substr(0, index);
|
|
10
12
|
const parameters = syntax
|
|
11
13
|
.substr(index, syntax.length - index - 1)
|
|
12
|
-
// https://regex101.com/r/ymosUf/1 : Exclude
|
|
13
|
-
.split(
|
|
14
|
+
// https://regex101.com/r/ymosUf/1 : Exclude the separator inside square braces
|
|
15
|
+
.split(new RegExp(`${escapeForRegExp(argumentSeparator)}\\s*(?=[^)^\\]^}]*(?:\\(|\\[|\\{|$))`, "gi"))
|
|
14
16
|
.map((a) => a.trim());
|
|
15
17
|
return {
|
|
16
18
|
functionOpen,
|
|
@@ -5,6 +5,8 @@ type FunctionInfoProps = {
|
|
|
5
5
|
parameterIndex?: number;
|
|
6
6
|
showFormulaHelp?: boolean;
|
|
7
7
|
onHideFormulaHelp?(): void;
|
|
8
|
+
/** Argument separator of the syntax being shown (the formula locale's; `,` by default). */
|
|
9
|
+
argumentSeparator?: string;
|
|
8
10
|
};
|
|
9
11
|
export declare const FunctionInfo: React.FC<FunctionInfoProps>;
|
|
10
12
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../function-info/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOvC,KAAK,iBAAiB,GAAG;IACvB,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,IAAI,IAAI,CAAC;CAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../function-info/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAkB,MAAM,OAAO,CAAC;AAOvC,KAAK,iBAAiB,GAAG;IACvB,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,IAAI,IAAI,CAAC;IAC3B,2FAA2F;IAC3F,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAUF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAyEpD,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { Separator } from "../separator";
|
|
|
5
5
|
import { tokenizeFunctionSyntax } from "./helpers";
|
|
6
6
|
import { StyledFunctionParameterTitle, StyledFunctionSubtitle } from "./style";
|
|
7
7
|
const ACTIVE_COLOR = "#008000";
|
|
8
|
-
export const FunctionInfo = ({ activeFunction, parameterIndex = 0, onHideFormulaHelp, }) => {
|
|
8
|
+
export const FunctionInfo = ({ activeFunction, parameterIndex = 0, onHideFormulaHelp, argumentSeparator = ",", }) => {
|
|
9
9
|
const { syntax, example, description, parameters } = activeFunction ?? {};
|
|
10
10
|
/**
|
|
11
11
|
* It can happen that formula list does not contain
|
|
@@ -13,8 +13,8 @@ export const FunctionInfo = ({ activeFunction, parameterIndex = 0, onHideFormula
|
|
|
13
13
|
* Use syntax
|
|
14
14
|
*/
|
|
15
15
|
const paramLen = useMemo(() => {
|
|
16
|
-
return tokenizeFunctionSyntax(syntax ?? "").parameters.length;
|
|
17
|
-
}, [syntax]);
|
|
16
|
+
return tokenizeFunctionSyntax(syntax ?? "", argumentSeparator).parameters.length;
|
|
17
|
+
}, [syntax, argumentSeparator]);
|
|
18
18
|
const paramIndex = Math.min(parameterIndex, paramLen - 1);
|
|
19
19
|
/**
|
|
20
20
|
* If Function is not documented,
|
|
@@ -25,7 +25,7 @@ export const FunctionInfo = ({ activeFunction, parameterIndex = 0, onHideFormula
|
|
|
25
25
|
return (React.createElement("div", { className: "break-words text-rnc-foreground" },
|
|
26
26
|
React.createElement("div", { className: "py-1 px-2 text-sm rounded-t-sm place-items-center flex bg-rnc-accent -mt-1 font-formula" },
|
|
27
27
|
React.createElement("div", { className: "flex-1" },
|
|
28
|
-
React.createElement(TokenizedFunction, { syntax: syntax, parameterIndex: paramIndex })),
|
|
28
|
+
React.createElement(TokenizedFunction, { syntax: syntax, parameterIndex: paramIndex, argumentSeparator: argumentSeparator })),
|
|
29
29
|
React.createElement(IconButton, { onClick: onHideFormulaHelp, title: "Hide formula suggestions for this cell" },
|
|
30
30
|
React.createElement(CrossCircledIcon, null))),
|
|
31
31
|
React.createElement(Separator, { orientation: "horizontal", color: "$gray7" }),
|
|
@@ -47,16 +47,16 @@ export const FunctionInfo = ({ activeFunction, parameterIndex = 0, onHideFormula
|
|
|
47
47
|
* Convert string function to tokens
|
|
48
48
|
* @param param0
|
|
49
49
|
*/
|
|
50
|
-
const TokenizedFunction = ({ syntax, parameterIndex, }) => {
|
|
50
|
+
const TokenizedFunction = ({ syntax, parameterIndex, argumentSeparator, }) => {
|
|
51
51
|
if (!syntax) {
|
|
52
52
|
return null;
|
|
53
53
|
}
|
|
54
|
-
const { functionOpen, parameters, functionClose } = tokenizeFunctionSyntax(syntax);
|
|
54
|
+
const { functionOpen, parameters, functionClose } = tokenizeFunctionSyntax(syntax, argumentSeparator);
|
|
55
55
|
const paramLen = parameters.length;
|
|
56
56
|
return (React.createElement(React.Fragment, null,
|
|
57
57
|
React.createElement("span", null, functionOpen),
|
|
58
58
|
parameters.map((param, i) => {
|
|
59
|
-
const sep = i < paramLen - 1 ?
|
|
59
|
+
const sep = i < paramLen - 1 ? `${argumentSeparator} ` : "";
|
|
60
60
|
return (React.createElement(React.Fragment, { key: i },
|
|
61
61
|
React.createElement("span", { style: {
|
|
62
62
|
color: parameterIndex === i ? ACTIVE_COLOR : void 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../../index.ts","../../utils.ts","../../vitest.config.ts","../../arrow/index.tsx","../../button/index.tsx","../../calendar/index.tsx","../../card/index.tsx","../../cell-tooltip/index.tsx","../../circular-loader/index.tsx","../../color-picker/index.tsx","../../color-picker/style.tsx","../../command/index.tsx","../../conditional-wrapper/index.tsx","../../dialog/index.tsx","../../dropdown/index.tsx","../../editor/constants.ts","../../editor/editor-error-boundary.tsx","../../editor/style.tsx","../../editor/suggestions-dropdown.tsx","../../editor-pm/constants.ts","../../editor-pm/decoration-plugin.ts","../../editor-pm/helpers.ts","../../editor-pm/index.tsx","../../editor-pm/mention-nodeview.tsx","../../editor-pm/mentions-dropdown.tsx","../../editor-pm/mentions-plugin.ts","../../editor-pm/placeholder-plugin.ts","../../editor-pm/prosemirror-editor.tsx","../../editor-pm/schema.ts","../../editor-pm/types.ts","../../editor-pm/unfocused-selection-plugin.ts","../../editor-pm/use-dropdown-change-pm.ts","../../editor-pm/use-editor-change-pm.ts","../../editor-pm/use-editor-decorator-pm.ts","../../editor-pm/use-editor-keydown-pm.ts","../../editor-pm/use-mention-keydown.ts","../../editor-pm/use-parameter-suggestions.
|
|
1
|
+
{"root":["../../index.ts","../../utils.ts","../../vitest.config.ts","../../arrow/index.tsx","../../button/index.tsx","../../calendar/index.tsx","../../card/index.tsx","../../cell-tooltip/index.tsx","../../circular-loader/index.tsx","../../color-picker/index.tsx","../../color-picker/style.tsx","../../command/index.tsx","../../conditional-wrapper/index.tsx","../../dialog/index.tsx","../../dropdown/index.tsx","../../editor/constants.ts","../../editor/editor-error-boundary.tsx","../../editor/style.tsx","../../editor/suggestions-dropdown.tsx","../../editor-pm/constants.ts","../../editor-pm/decoration-plugin.ts","../../editor-pm/helpers.ts","../../editor-pm/index.tsx","../../editor-pm/mention-nodeview.tsx","../../editor-pm/mentions-dropdown.tsx","../../editor-pm/mentions-plugin.ts","../../editor-pm/placeholder-plugin.ts","../../editor-pm/prosemirror-editor.tsx","../../editor-pm/schema.ts","../../editor-pm/types.ts","../../editor-pm/unfocused-selection-plugin.ts","../../editor-pm/use-dropdown-change-pm.ts","../../editor-pm/use-editor-change-pm.ts","../../editor-pm/use-editor-decorator-pm.ts","../../editor-pm/use-editor-keydown-pm.ts","../../editor-pm/use-mention-keydown.ts","../../editor-pm/use-parameter-suggestions.ts","../../eye-dropper/index.tsx","../../function-info/helpers.ts","../../function-info/index.tsx","../../function-info/style.tsx","../../hex-color-picker/index.tsx","../../hooks/use-cycle-reference.ts","../../hooks/use-dropdown-categories.ts","../../hooks/use-dropdown.ts","../../hooks/use-isomorphic-layout-effect.ts.ts","../../hooks/use-modal.tsx","../../hooks/use-visibility.ts","../../icon-button/index.tsx","../../input/index.tsx","../../popover/index.tsx","../../progress/index.tsx","../../select/index.tsx","../../separator/index.tsx","../../skeleton/index.tsx","../../stack/index.tsx","../../tabs/index.tsx","../../tooltip/index.tsx"],"version":"5.8.3"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rowsncolumns/ui",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "16.0.1",
|
|
4
4
|
"author": "Vinay M",
|
|
5
5
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
6
6
|
"main": "./dist/cjs/index.js",
|
|
@@ -14,6 +14,8 @@
|
|
|
14
14
|
"scripts": {
|
|
15
15
|
"build": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json",
|
|
16
16
|
"test": "vitest --run",
|
|
17
|
+
"types:specs": "node ../../scripts/typecheck-specs.mjs",
|
|
18
|
+
"types:specs:update": "node ../../scripts/typecheck-specs.mjs --update",
|
|
17
19
|
"clean": "rimraf dist",
|
|
18
20
|
"build:watch": "tsc -p ./tsconfig.esm.json --watch",
|
|
19
21
|
"lint": "eslint . --ext .ts,.tsx"
|
|
@@ -29,7 +31,6 @@
|
|
|
29
31
|
"dist"
|
|
30
32
|
],
|
|
31
33
|
"dependencies": {
|
|
32
|
-
"cmdk": "^1.0.0",
|
|
33
34
|
"@radix-ui/react-dialog": "^1.1.14",
|
|
34
35
|
"@radix-ui/react-dropdown-menu": "^2.1.15",
|
|
35
36
|
"@radix-ui/react-popover": "^1.1.14",
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"@radix-ui/react-tooltip": "^1.2.7",
|
|
41
42
|
"class-variance-authority": "^0.7.1",
|
|
42
43
|
"clsx": "^2.1.1",
|
|
44
|
+
"cmdk": "^1.0.0",
|
|
43
45
|
"date-fns": "^4.1.0",
|
|
44
46
|
"match-sorter": "^8.2.0",
|
|
45
47
|
"prosemirror-commands": "^1.7.1",
|
|
@@ -55,25 +57,26 @@
|
|
|
55
57
|
"tailwind-merge": "^3.3.0"
|
|
56
58
|
},
|
|
57
59
|
"devDependencies": {
|
|
58
|
-
"@rowsncolumns/calculator": ">=7.
|
|
59
|
-
"@rowsncolumns/common-types": ">=5.2.
|
|
60
|
-
"@rowsncolumns/fast-formula-parser": ">=6.2.
|
|
61
|
-
"@rowsncolumns/functions": ">=
|
|
60
|
+
"@rowsncolumns/calculator": ">=7.3.0",
|
|
61
|
+
"@rowsncolumns/common-types": ">=5.2.34",
|
|
62
|
+
"@rowsncolumns/fast-formula-parser": ">=6.2.40",
|
|
63
|
+
"@rowsncolumns/functions": ">=15.0.1",
|
|
62
64
|
"@rowsncolumns/grid": ">=13.2.33",
|
|
63
65
|
"@rowsncolumns/icons": ">=7.2.31",
|
|
64
|
-
"@rowsncolumns/utils": ">=9.
|
|
66
|
+
"@rowsncolumns/utils": ">=9.4.0",
|
|
65
67
|
"@types/lodash": "^4.17.17",
|
|
66
68
|
"react": "^19.1.0",
|
|
67
69
|
"react-dom": "^19.1.0"
|
|
68
70
|
},
|
|
69
71
|
"peerDependencies": {
|
|
70
|
-
"@rowsncolumns/calculator": ">=7.
|
|
72
|
+
"@rowsncolumns/calculator": ">=7.3.0",
|
|
71
73
|
"@rowsncolumns/common-types": ">=5.2.33",
|
|
72
74
|
"@rowsncolumns/fast-formula-parser": ">=6.2.39",
|
|
73
|
-
"@rowsncolumns/functions": ">=
|
|
75
|
+
"@rowsncolumns/functions": ">=15.0.0",
|
|
74
76
|
"@rowsncolumns/grid": ">=13.2.33",
|
|
75
77
|
"@rowsncolumns/icons": ">=7.2.31",
|
|
76
|
-
"@rowsncolumns/
|
|
78
|
+
"@rowsncolumns/spreadsheet": ">=10.3.0",
|
|
79
|
+
"@rowsncolumns/utils": ">=9.3.0",
|
|
77
80
|
"react": ">=18.0.0",
|
|
78
81
|
"react-dom": ">=18.0.0"
|
|
79
82
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"use-parameter-suggestions.test.d.ts","sourceRoot":"","sources":["../../../editor-pm/use-parameter-suggestions.test.tsx"],"names":[],"mappings":""}
|
|
@@ -1,122 +0,0 @@
|
|
|
1
|
-
import { __awaiter, __generator } from "tslib";
|
|
2
|
-
import React from "react";
|
|
3
|
-
import { cleanup, render, screen, waitFor, act } from "@testing-library/react";
|
|
4
|
-
import { afterEach, describe, it, expect, vi } from "vitest";
|
|
5
|
-
import { useParameterSuggestions } from "./use-parameter-suggestions";
|
|
6
|
-
var TestHarness = function (_a) {
|
|
7
|
-
var functionToken = _a.functionToken, fetcher = _a.fetcher;
|
|
8
|
-
var parameterSuggestions = useParameterSuggestions({
|
|
9
|
-
functionToken: functionToken,
|
|
10
|
-
parameterIndex: 0,
|
|
11
|
-
parameterArguments: [],
|
|
12
|
-
getFunctionParameterSuggestions: fetcher,
|
|
13
|
-
}).parameterSuggestions;
|
|
14
|
-
return (React.createElement("div", { "data-testid": "items" }, parameterSuggestions.map(function (item) { return item.title; }).join(",")));
|
|
15
|
-
};
|
|
16
|
-
var makeFunctionToken = function (name) {
|
|
17
|
-
if (name === void 0) { name = "SUM"; }
|
|
18
|
-
return ({
|
|
19
|
-
image: name,
|
|
20
|
-
tokenType: { name: "Function", PATTERN: "" },
|
|
21
|
-
startColumn: 0,
|
|
22
|
-
endColumn: 0,
|
|
23
|
-
startOffset: 0,
|
|
24
|
-
endOffset: 0,
|
|
25
|
-
endLine: 0,
|
|
26
|
-
tokenTypeIdx: 0,
|
|
27
|
-
});
|
|
28
|
-
};
|
|
29
|
-
afterEach(function () { return cleanup(); });
|
|
30
|
-
describe("useParameterSuggestions", function () {
|
|
31
|
-
it("returns async suggestions for an active function", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
32
|
-
var fetcher;
|
|
33
|
-
return __generator(this, function (_a) {
|
|
34
|
-
switch (_a.label) {
|
|
35
|
-
case 0:
|
|
36
|
-
fetcher = vi
|
|
37
|
-
.fn()
|
|
38
|
-
.mockResolvedValue([{ title: "paramA", category: "parameter" }]);
|
|
39
|
-
render(React.createElement(TestHarness, { functionToken: makeFunctionToken(), fetcher: fetcher }));
|
|
40
|
-
return [4 /*yield*/, waitFor(function () {
|
|
41
|
-
return expect(screen.getByTestId("items").textContent).toBe("paramA");
|
|
42
|
-
})];
|
|
43
|
-
case 1:
|
|
44
|
-
_a.sent();
|
|
45
|
-
expect(fetcher).toHaveBeenCalledWith("SUM", 0, []);
|
|
46
|
-
return [2 /*return*/];
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
}); });
|
|
50
|
-
it("ignores stale responses when function token changes", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
51
|
-
var resolveFirst, resolveSecond, fetcher, rerender;
|
|
52
|
-
return __generator(this, function (_a) {
|
|
53
|
-
switch (_a.label) {
|
|
54
|
-
case 0:
|
|
55
|
-
resolveFirst = function () { };
|
|
56
|
-
resolveSecond = function () { };
|
|
57
|
-
fetcher = vi
|
|
58
|
-
.fn()
|
|
59
|
-
.mockImplementationOnce(function () {
|
|
60
|
-
return new Promise(function (res) {
|
|
61
|
-
resolveFirst = res;
|
|
62
|
-
});
|
|
63
|
-
})
|
|
64
|
-
.mockImplementationOnce(function () {
|
|
65
|
-
return new Promise(function (res) {
|
|
66
|
-
resolveSecond = res;
|
|
67
|
-
});
|
|
68
|
-
});
|
|
69
|
-
rerender = render(React.createElement(TestHarness, { functionToken: makeFunctionToken(), fetcher: fetcher })).rerender;
|
|
70
|
-
// Trigger second request with a new token
|
|
71
|
-
rerender(React.createElement(TestHarness, { functionToken: makeFunctionToken("AVG"), fetcher: fetcher }));
|
|
72
|
-
return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
73
|
-
return __generator(this, function (_a) {
|
|
74
|
-
resolveFirst([{ title: "first", category: "parameter" }]);
|
|
75
|
-
return [2 /*return*/];
|
|
76
|
-
});
|
|
77
|
-
}); })];
|
|
78
|
-
case 1:
|
|
79
|
-
_a.sent();
|
|
80
|
-
expect(screen.getByTestId("items").textContent).toBe("");
|
|
81
|
-
return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
82
|
-
return __generator(this, function (_a) {
|
|
83
|
-
resolveSecond([{ title: "second", category: "parameter" }]);
|
|
84
|
-
return [2 /*return*/];
|
|
85
|
-
});
|
|
86
|
-
}); })];
|
|
87
|
-
case 2:
|
|
88
|
-
_a.sent();
|
|
89
|
-
return [4 /*yield*/, waitFor(function () {
|
|
90
|
-
return expect(screen.getByTestId("items").textContent).toBe("second");
|
|
91
|
-
})];
|
|
92
|
-
case 3:
|
|
93
|
-
_a.sent();
|
|
94
|
-
return [2 /*return*/];
|
|
95
|
-
}
|
|
96
|
-
});
|
|
97
|
-
}); });
|
|
98
|
-
it("clears suggestions when there is no active function", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
99
|
-
var fetcher, rerender;
|
|
100
|
-
return __generator(this, function (_a) {
|
|
101
|
-
switch (_a.label) {
|
|
102
|
-
case 0:
|
|
103
|
-
fetcher = vi
|
|
104
|
-
.fn()
|
|
105
|
-
.mockResolvedValue([{ title: "paramA", category: "parameter" }]);
|
|
106
|
-
rerender = render(React.createElement(TestHarness, { functionToken: makeFunctionToken(), fetcher: fetcher })).rerender;
|
|
107
|
-
return [4 /*yield*/, waitFor(function () {
|
|
108
|
-
return expect(screen.getByTestId("items").textContent).toBe("paramA");
|
|
109
|
-
})];
|
|
110
|
-
case 1:
|
|
111
|
-
_a.sent();
|
|
112
|
-
rerender(React.createElement(TestHarness, { fetcher: fetcher }));
|
|
113
|
-
return [4 /*yield*/, waitFor(function () {
|
|
114
|
-
return expect(screen.getByTestId("items").textContent).toBe("");
|
|
115
|
-
})];
|
|
116
|
-
case 2:
|
|
117
|
-
_a.sent();
|
|
118
|
-
return [2 /*return*/];
|
|
119
|
-
}
|
|
120
|
-
});
|
|
121
|
-
}); });
|
|
122
|
-
});
|