diff options
author | bobzel <zzzman@gmail.com> | 2024-05-03 11:02:07 -0400 |
---|---|---|
committer | bobzel <zzzman@gmail.com> | 2024-05-03 11:02:07 -0400 |
commit | e77b55c771a2bd3ba49169185edd9ed2099de1c6 (patch) | |
tree | f070e9e64ecaf251e6708b8ce4d722f121a6d039 /src/client/views/nodes/formattedText/DashFieldView.tsx | |
parent | 4c6640a630b541611a55c54cd392193119579de2 (diff) | |
parent | f927a585c75a20629379bcb34d1483c0ca9d8db9 (diff) |
Merge branch 'nathan-starter' into restoringEslint
Diffstat (limited to 'src/client/views/nodes/formattedText/DashFieldView.tsx')
-rw-r--r-- | src/client/views/nodes/formattedText/DashFieldView.tsx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/views/nodes/formattedText/DashFieldView.tsx b/src/client/views/nodes/formattedText/DashFieldView.tsx index 5d53a2a5f..9903d0e8a 100644 --- a/src/client/views/nodes/formattedText/DashFieldView.tsx +++ b/src/client/views/nodes/formattedText/DashFieldView.tsx @@ -141,7 +141,6 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi this._reactionDisposer?.(); } isRowActive = () => (this._props.nodeSelected() || this._expanded) && this._props.editable; - finishEdit = action(() => { if (this._expanded) { this._expanded = false; @@ -150,7 +149,7 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi setTimeout(() => !this._props.tbox.ProseRef?.contains(document.activeElement) && this._props.tbox._props.onBlur?.()); } }); - selectedCell = (): [Doc, number] | undefined => (this._dashDoc ? [this._dashDoc, 0] : undefined); + selectedCells = () => (this._dashDoc ? [this._dashDoc] : undefined); columnWidth = () => Math.min(this._props.tbox._props.PanelWidth(), Math.max(50, this._props.tbox._props.PanelWidth() - 100)); // try to leave room for the fieldKey // set the display of the field's value (checkbox for booleans, span of text for strings) @@ -168,13 +167,15 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi selectCell={emptyFunction} maxWidth={this._props.hideKey || this._hideKey ? undefined : this._props.tbox._props.PanelWidth} columnWidth={this._expanded || this._props.nodeSelected() ? this.columnWidth : returnZero} - selectedCell={this.selectedCell} + selectedCells={this.selectedCells} + selectedCol={returnZero} fieldKey={this._fieldKey} rowHeight={returnZero} isRowActive={this.isRowActive} padding={0} getFinfo={emptyFunction} setColumnValues={returnFalse} + setSelectedColumnValues={returnFalse} allowCRs oneLine={!this._expanded && !this._props.nodeSelected()} finishEdit={this.finishEdit} |