aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/util/DocumentManager.ts5
-rw-r--r--src/client/util/SelectionManager.ts1
-rw-r--r--src/client/util/UndoManager.ts16
-rw-r--r--src/client/views/collections/CollectionNoteTakingView.tsx1
-rw-r--r--src/client/views/nodes/DocumentView.tsx19
-rw-r--r--src/client/views/nodes/formattedText/DashFieldView.tsx8
6 files changed, 22 insertions, 28 deletions
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 561114182..ae5fafcdd 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -36,7 +36,6 @@ export class DocumentManager {
}
public DeleteDocumentView(dv: DocumentView) {
this._documentViews.delete(dv);
- console.log("deleted")
}
//private constructor so no other class can create a nodemanager
@@ -95,7 +94,7 @@ export class DocumentManager {
this.callAddViewFuncs(view);
} // prettier-ignore
};
-
+
public RemoveView = action((view: DocumentView) => {
if (!view._props.LayoutTemplateString?.includes(KeyValueBox.name) && !view._props.LayoutTemplateString?.includes(LinkAnchorBox.name)) {
this.DeleteDocumentView(view);
@@ -127,8 +126,6 @@ export class DocumentManager {
public getDocumentView(target: Doc | undefined, preferredCollection?: DocumentView): DocumentView | undefined {
const docViewArray = DocumentManager.Instance.DocumentViews;
- //console.log(docViewArray)
- //console.log(this._documentViews)
const passes = !target ? [] : preferredCollection ? [preferredCollection, undefined] : [undefined];
return passes.reduce(
(toReturn, pass) =>
diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index b6ee4d5c3..dd34d5f22 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -9,7 +9,6 @@ import { DocumentView } from '../views/nodes/DocumentView';
import { LinkManager } from './LinkManager';
import { ScriptingGlobals } from './ScriptingGlobals';
import { UndoManager } from './UndoManager';
-import { SchemaRowBox } from '../views/collections/collectionSchema/SchemaRowBox';
export class SelectionManager {
private static _manager: SelectionManager;
diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 20801baa7..b16fed675 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -97,13 +97,13 @@ export namespace UndoManager {
export function AddEvent(event: UndoEvent, value?: any): void {
if (currentBatch && batchCounter.get() && !undoing) {
- // console.log(
- // ' '.slice(0, batchCounter.get()) +
- // 'UndoEvent : ' +
- // event.prop +
- // ' = ' +
- // (value instanceof RichTextField ? value.Text : value instanceof Array ? value.map(val => Field.toJavascriptString(val)).join(',') : Field.toJavascriptString(value))
- // );
+ console.log(
+ ' '.slice(0, batchCounter.get()) +
+ 'UndoEvent : ' +
+ event.prop +
+ ' = ' +
+ (value instanceof RichTextField ? value.Text : value instanceof Array ? value.map(val => Field.toJavascriptString(val)).join(',') : Field.toJavascriptString(value))
+ );
currentBatch.push(event);
tempEvents?.push(event);
}
@@ -181,7 +181,7 @@ export namespace UndoManager {
const EndBatch = action((batchName: string, cancel: boolean = false) => {
runInAction(() => batchCounter.set(batchCounter.get() - 1));
- //console.log(' '.slice(0, batchCounter.get()) + 'End ' + batchName + ' (' + currentBatch?.length + ')');
+ console.log(' '.slice(0, batchCounter.get()) + 'End ' + batchName + ' (' + currentBatch?.length + ')');
if (batchCounter.get() === 0 && currentBatch?.length) {
if (!cancel) {
undoStack.push(currentBatch);
diff --git a/src/client/views/collections/CollectionNoteTakingView.tsx b/src/client/views/collections/CollectionNoteTakingView.tsx
index 8c10db5dc..6318620e0 100644
--- a/src/client/views/collections/CollectionNoteTakingView.tsx
+++ b/src/client/views/collections/CollectionNoteTakingView.tsx
@@ -138,7 +138,6 @@ export class CollectionNoteTakingView extends CollectionSubView() {
sections.get(existingHeader)!.push(d);
}
});
- //*!*
// now we add back in the docs that we're dragging
if (rowCol.length && columnHeaders.length > rowCol[1]) {
const offset = 0;
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 5f2a71ef5..ae83819e5 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -279,7 +279,6 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
}
startDragging(x: number, y: number, dropAction: dropActionType, hideSource = false) {
- //console.log("docview drag")
const docView = this._docView;
if (this._mainCont.current && docView) {
const views = SelectionManager.Views.filter(dv => dv.ContentDiv);
@@ -381,7 +380,7 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
onPointerDown = (e: React.PointerEvent): void => {
if (this._props.isGroupActive?.() === 'child' && !this._props.isDocumentActive?.()) return;
- this._longPressSelector = setTimeout(() => (DocumentView.LongPress && this._props.select(false), 1000)); //!!!
+ this._longPressSelector = setTimeout(() => (DocumentView.LongPress && this._props.select(false), 1000));
if (!GestureOverlay.DownDocView) GestureOverlay.DownDocView = this._docView;
this._downX = e.clientX;
@@ -1348,14 +1347,14 @@ export class DocumentView extends DocComponent<DocumentViewProps>() {
select = (extendSelection: boolean, focusSelection?: boolean) => {
/*if (this.IsSelected && SelectionManager.Views.length > 1) SelectionManager.DeselectView(this);
else {*/
- SelectionManager.SelectView(this, extendSelection);
- if (focusSelection) {
- DocumentManager.Instance.showDocument(this.Document, {
- willZoomCentered: true,
- zoomScale: 0.9,
- zoomTime: 500,
- });
- }
+ SelectionManager.SelectView(this, extendSelection);
+ if (focusSelection) {
+ DocumentManager.Instance.showDocument(this.Document, {
+ willZoomCentered: true,
+ zoomScale: 0.9,
+ zoomTime: 500,
+ });
+ }
//}
};
DataTransition = () => this._props.DataTransition?.() || StrCast(this.Document.dataTransition);
diff --git a/src/client/views/nodes/formattedText/DashFieldView.tsx b/src/client/views/nodes/formattedText/DashFieldView.tsx
index a9d916fcd..6186b3d99 100644
--- a/src/client/views/nodes/formattedText/DashFieldView.tsx
+++ b/src/client/views/nodes/formattedText/DashFieldView.tsx
@@ -135,12 +135,12 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi
isRowActive = () => this._expanded && this._props.editable;
finishEdit = action(() => (this._expanded = false));
selectedCell = (): [Doc, number] => [this._dashDoc!, 0];
+ selectedCells = () => [this._dashDoc!];
// set the display of the field's value (checkbox for booleans, span of text for strings)
@computed get fieldValueContent() {
return !this._dashDoc ? null : (
- <div onClick={action(e => {console.log(true);
- (this._expanded = !this._props.editable ? !this._expanded : true)})} style={{ fontSize: 'smaller', width: this._props.hideKey ? this._props.tbox._props.PanelWidth() - 20 : undefined }}>
+ <div onClick={action(e => (this._expanded = !this._props.editable ? !this._expanded : true))} style={{ fontSize: 'smaller', width: this._props.hideKey ? this._props.tbox._props.PanelWidth() - 20 : undefined }}>
<SchemaTableCell
Document={this._dashDoc}
col={0}
@@ -148,8 +148,8 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi
selectCell={emptyFunction}
maxWidth={this._props.hideKey || this._hideKey ? undefined : this._props.tbox._props.PanelWidth}
columnWidth={returnZero}
- selectedCells={() => [this._dashDoc!]}
- selectedCol={() => 0}
+ selectedCells={this.selectedCells}
+ selectedCol={returnZero}
fieldKey={this._fieldKey}
rowHeight={returnZero}
isRowActive={this.isRowActive}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-07 09:17:23 +0000