aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/util/CaptureManager.tsx1
-rw-r--r--src/client/util/SelectionManager.ts2
-rw-r--r--src/client/util/UndoManager.ts18
-rw-r--r--src/client/views/DocumentDecorations.tsx1
-rw-r--r--src/client/views/MainView.tsx1
-rw-r--r--src/client/views/collections/collectionFreeForm/MarqueeView.tsx2
-rw-r--r--src/client/views/collections/collectionSchema/CollectionSchemaView.tsx42
-rw-r--r--src/client/views/collections/collectionSchema/SchemaTableCell.tsx7
-rw-r--r--src/client/views/nodes/DocumentView.tsx3
-rw-r--r--src/client/views/nodes/formattedText/DashFieldView.tsx3
10 files changed, 49 insertions, 31 deletions
diff --git a/src/client/util/CaptureManager.tsx b/src/client/util/CaptureManager.tsx
index 2e13aff2f..17eba55e7 100644
--- a/src/client/util/CaptureManager.tsx
+++ b/src/client/util/CaptureManager.tsx
@@ -82,6 +82,7 @@ export class CaptureManager extends React.Component<{}> {
<div
className="cancel"
onClick={() => {
+ console.log("cancel") //!!!
const selected = SelectionManager.Views.slice();
SelectionManager.DeselectAll();
selected.map(dv => dv.props.removeDocument?.(dv.Document));
diff --git a/src/client/util/SelectionManager.ts b/src/client/util/SelectionManager.ts
index 6f6278662..1a8680e2b 100644
--- a/src/client/util/SelectionManager.ts
+++ b/src/client/util/SelectionManager.ts
@@ -44,6 +44,7 @@ export class SelectionManager {
});
public static DeselectView = action((docView?: DocumentView): void => {
+ console.log("single deselect")
if (docView && this.Instance.SelectedViews.includes(docView)) {
docView.IsSelected = false;
this.Instance.SelectedViews.splice(this.Instance.SelectedViews.indexOf(docView), 1);
@@ -52,6 +53,7 @@ export class SelectionManager {
});
public static DeselectAll = (except?: Doc): void => {
+ //console.log("deselect all")
const found = this.Instance.SelectedViews.find(dv => dv.Document === except);
runInAction(() => {
LinkManager.Instance.currentLink = undefined;
diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 421855bf3..20801baa7 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);
}
@@ -171,7 +171,7 @@ export namespace UndoManager {
}
export function StartBatch(batchName: string): Batch {
- console.log(' '.slice(0, batchCounter.get()) + 'Start ' + batchCounter + ' ' + batchName);
+ //console.log(' '.slice(0, batchCounter.get()) + 'Start ' + batchCounter + ' ' + batchName);
runInAction(() => batchCounter.set(batchCounter.get() + 1));
if (currentBatch === undefined) {
currentBatch = [];
@@ -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/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 2fb9f0fc1..8f042e68c 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -301,6 +301,7 @@ export class DocumentDecorations extends ObservableReactComponent<DocumentDecora
onIconifyClick = (): void => {
SelectionManager.Views.forEach(dv => dv?.iconify());
+ console.log("iconify") //!!!
SelectionManager.DeselectAll();
};
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 677114e2d..eb45350a8 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -573,6 +573,7 @@ export class MainView extends ObservableReactComponent<{}> {
if (!e.cancelBubble) {
const pathstr = (e as any)?.path?.map((p: any) => p.classList?.toString()).join();
if (pathstr?.includes('libraryFlyout')) {
+ console.log("random") //!!!
SelectionManager.DeselectAll();
}
}
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index b913e05ad..62f391201 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -249,6 +249,7 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
if (this._visible) {
const mselect = this.marqueeSelect();
if (!e.shiftKey) {
+ console.log("marquee pointerup") //!!!
SelectionManager.DeselectAll(mselect.length ? undefined : this._props.Document);
}
const docs = mselect.length ? mselect : [this._props.Document];
@@ -373,6 +374,7 @@ export class MarqueeView extends ObservableReactComponent<SubCollectionViewProps
@undoBatch
pileup = action((e: KeyboardEvent | React.PointerEvent | undefined) => {
+ console.log("pileup")//!!!
const selected = this.marqueeSelect(false);
SelectionManager.DeselectAll();
selected.forEach(d => this._props.removeDocument?.(d));
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index a4d7eae06..7067aed5a 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -373,6 +373,9 @@ export class CollectionSchemaView extends CollectionSubView() {
@undoBatch
moveColumn = (fromIndex: number, toIndex: number) => {
+ console.log("from: " + fromIndex + " to: " + toIndex)
+ if (toIndex === this._selectedCol) this._selectedCol = fromIndex; //keeps selected cell consistent
+
let currKeys = this.columnKeys.slice();
currKeys.splice(toIndex, 0, currKeys.splice(fromIndex, 1)[0]);
this.layoutDoc.schema_columnKeys = new List<string>(currKeys);
@@ -380,6 +383,8 @@ export class CollectionSchemaView extends CollectionSubView() {
let currWidths = this.storedColumnWidths.slice();
currWidths.splice(toIndex, 0, currWidths.splice(fromIndex, 1)[0]);
this.layoutDoc.schema_columnWidths = new List<number>(currWidths);
+
+ this._draggedColIndex = toIndex;
};
@action
@@ -466,23 +471,23 @@ export class CollectionSchemaView extends CollectionSubView() {
this._colEles.forEach((colRef, i) => {
let edgeStyle = '';
if (i === index) edgeStyle = `solid 2px ${Colors.MEDIUM_BLUE}`;
+
+ //border styles of menu cell
colRef.style.borderLeft = edgeStyle;
colRef.style.borderRight = edgeStyle;
colRef.style.borderTop = edgeStyle;
+
for (let doc = 0; doc < this.childDocs.length; ++doc){
- this._rowEles.get(this.childDocs[doc]).children[1].children[i].style.borderLeft = edgeStyle;
- this._rowEles.get(this.childDocs[doc]).children[1].children[i].style.borderRight = edgeStyle;
- if (doc === this.childDocs.length - 1){
- this._rowEles.get(this.childDocs[doc]).children[1].children[i].style.borderBottom = edgeStyle;
+ if (i === this._selectedCol && this._selectedDocs.includes(this.childDocs[doc])){
+ continue;
+ } else {
+ this._rowEles.get(this.childDocs[doc]).children[1].children[i].style.borderLeft = edgeStyle;
+ this._rowEles.get(this.childDocs[doc]).children[1].children[i].style.borderRight = edgeStyle;
+ if (doc === this.childDocs.length - 1){
+ this._rowEles.get(this.childDocs[doc]).children[1].children[i].style.borderBottom = edgeStyle;
+ }
}
}
- // this.childDocs.forEach(doc => {
- // this._rowEles.get(doc).children[1].children[i].style.borderLeft = edgeStyle;
- // this._rowEles.get(doc).children[1].children[i].style.borderRight = edgeStyle;
- // if (i === this.childDocs.length - 1){
- // this._rowEles.get(doc).children[1].children[i].style.borderBottom = edgeStyle;
- // }
- // });
});
};
@@ -502,11 +507,11 @@ export class CollectionSchemaView extends CollectionSubView() {
addDocToSelection = (doc: Doc, extendSelection: boolean, index: number) => {
const rowDocView = DocumentManager.Instance.getDocumentView(doc);
if (rowDocView) SelectionManager.SelectView(rowDocView, extendSelection);
- else console.log("nonexistent")
};
@action
clearSelection = () => {
+ //console.log("clear selection") //!!!
SelectionManager.DeselectAll();
this.deselectAllCells();
};
@@ -575,14 +580,17 @@ export class CollectionSchemaView extends CollectionSubView() {
e.stopPropagation();
this._colEles.forEach((colRef, i) => {
+ //style for menu cell
colRef.style.borderLeft = '';
colRef.style.borderRight = '';
colRef.style.borderTop = '';
- colRef.style.borderBottom = '';
+
this.childDocs.forEach(doc => {
- this._rowEles.get(doc).children[1].children[i].style.borderLeft = '';
- this._rowEles.get(doc).children[1].children[i].style.borderRight = '';
- this._rowEles.get(doc).children[1].children[i].style.borderBottom = '';
+ if (!(this._selectedDocs.includes(doc) && i === this._selectedCol)){
+ this._rowEles.get(doc).children[1].children[i].style.borderLeft = '';
+ this._rowEles.get(doc).children[1].children[i].style.borderRight = '';
+ this._rowEles.get(doc).children[1].children[i].style.borderBottom = '';
+ }
});
});
return true;
@@ -899,7 +907,7 @@ export class CollectionSchemaView extends CollectionSubView() {
);
}
get renderKeysMenu() {
- console.log('RNDERMENUT:' + this._columnMenuIndex);
+ //console.log('RNDERMENUT:' + this._columnMenuIndex);
return (
<div className="schema-column-menu" style={{ left: 0, minWidth: CollectionSchemaView._minColWidth }}>
<input className="schema-key-search-input" type="text" onKeyDown={this.onSearchKeyDown} onChange={this.updateKeySearch} onPointerDown={e => e.stopPropagation()} />
diff --git a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
index 1786d688b..6bbc4dfa6 100644
--- a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
@@ -109,9 +109,9 @@ export class SchemaTableCell extends ObservableReactComponent<SchemaTableCellPro
}
@computed get selected() {
- const selected: Doc[] | undefined = this._props.selectedCells();
- let istrue = this._props.isRowActive() && (selected?.filter(doc => doc === this._props.Document).length !== 0) && this._props.selectedCol() === this._props.col;
- return istrue;
+ const selectedDocs: Doc[] | undefined = this._props.selectedCells();
+ let isSelected = this._props.isRowActive() && (selectedDocs?.filter(doc => doc === this._props.Document).length !== 0) && this._props.selectedCol() === this._props.col;
+ return isSelected;
}
@computed get defaultCellContent() {
@@ -178,6 +178,7 @@ export class SchemaTableCell extends ObservableReactComponent<SchemaTableCellPro
}
}
+
render() {
return (
<div
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 3764f6edd..5f243ad9f 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -333,6 +333,7 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
if (this.onDoubleClickHandler?.script) {
UndoManager.RunInBatch(() => this.onDoubleClickHandler.script.run(scriptProps, console.log).result?.select && this._props.select(false), 'on double click: ' + this.Document.title);
} else if (!Doc.IsSystem(this.Document) && defaultDblclick !== 'ignore') {
+ console.log("double click") //!!!
UndoManager.RunInBatch(() => LightboxView.Instance.AddDocTab(this.Document, OpenWhere.lightbox), 'double tap');
SelectionManager.DeselectAll();
Doc.UnBrushDoc(this.Document);
@@ -381,7 +382,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(() => {console.log("long press"); DocumentView.LongPress && this._props.select(false), 1000}); //!!!
if (!GestureOverlay.DownDocView) GestureOverlay.DownDocView = this._docView;
this._downX = e.clientX;
diff --git a/src/client/views/nodes/formattedText/DashFieldView.tsx b/src/client/views/nodes/formattedText/DashFieldView.tsx
index c0c729fb5..a9d916fcd 100644
--- a/src/client/views/nodes/formattedText/DashFieldView.tsx
+++ b/src/client/views/nodes/formattedText/DashFieldView.tsx
@@ -139,7 +139,8 @@ export class DashFieldViewInternal extends ObservableReactComponent<IDashFieldVi
// 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 => (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 => {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 }}>
<SchemaTableCell
Document={this._dashDoc}
col={0}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-17 09:11:31 +0000