aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/DocumentDecorations.scss3
-rw-r--r--src/DocumentDecorations.tsx64
-rw-r--r--src/Main.tsx2
-rw-r--r--src/documents/Documents.ts2
-rw-r--r--src/util/SelectionManager.ts39
-rw-r--r--src/viewmodels/DocumentViewModel.ts10
-rw-r--r--src/views/freeformcanvas/CollectionFreeFormView.tsx10
-rw-r--r--src/views/freeformcanvas/FreeFormCanvas.tsx4
-rw-r--r--src/views/nodes/DocumentView.tsx24
9 files changed, 153 insertions, 5 deletions
diff --git a/src/DocumentDecorations.scss b/src/DocumentDecorations.scss
new file mode 100644
index 000000000..34c279e60
--- /dev/null
+++ b/src/DocumentDecorations.scss
@@ -0,0 +1,3 @@
+.documentDecorations-container {
+ background: blue;
+} \ No newline at end of file
diff --git a/src/DocumentDecorations.tsx b/src/DocumentDecorations.tsx
new file mode 100644
index 000000000..60596e96a
--- /dev/null
+++ b/src/DocumentDecorations.tsx
@@ -0,0 +1,64 @@
+import { observable, computed } from "mobx";
+import React = require("react");
+import { DocumentView } from "./views/nodes/DocumentView";
+import { SelectionManager } from "./util/SelectionManager";
+
+export class DocumentDecorations extends React.Component {
+ @computed
+ get x(): number {
+ let left = Number.MAX_VALUE;
+ SelectionManager.SelectedDocuments().forEach(element => {
+ if (element.mainCont.current !== null) {
+ left = Math.min(element.mainCont.current.getBoundingClientRect().left, left)
+ }
+ });
+ return left;
+ }
+
+ @computed
+ get y(): number {
+ let top = Number.MAX_VALUE;
+ SelectionManager.SelectedDocuments().forEach(element => {
+ if (element.mainCont.current !== null) {
+ top = Math.min(element.mainCont.current.getBoundingClientRect().top, top)
+ }
+ });
+ return top;
+ }
+
+ @computed
+ get height(): number {
+ let bottom = Number.MIN_VALUE;
+ SelectionManager.SelectedDocuments().forEach(element => {
+ if (element.mainCont.current !== null) {
+ bottom = Math.min(element.mainCont.current.getBoundingClientRect().bottom, bottom)
+ }
+ });
+ return bottom - this.y;
+ }
+
+ @computed
+ get width(): number {
+ let right = Number.MIN_VALUE;
+ console.log(SelectionManager.SelectedDocuments())
+ SelectionManager.SelectedDocuments().forEach(element => {
+ if (element.mainCont.current !== null) {
+ right = Math.min(element.mainCont.current.getBoundingClientRect().right, right)
+ }
+ });
+ return right - this.x;
+ }
+
+ render() {
+ return(
+ <div className="documentDecorations-container" style={{
+ width: `${this.width}px`,
+ height: `${this.height}px`,
+ left: this.x,
+ top: this.y
+ }}>
+
+ </div>
+ )
+ }
+} \ No newline at end of file
diff --git a/src/Main.tsx b/src/Main.tsx
index 09c2b111f..f911b6098 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -11,6 +11,7 @@ import { Document } from './fields/Document';
import { configure, runInAction } from 'mobx';
import { NodeStore } from './stores/NodeStore';
import { Documents } from './documents/Documents';
+import { DocumentDecorations } from './DocumentDecorations';
configure({
enforceActions: "observed"
@@ -20,6 +21,7 @@ const mainNodeCollection = new NodeCollectionStore();
ReactDOM.render((
<div>
<h1>Dash Web</h1>
+ <DocumentDecorations />
<FreeFormCanvas store={mainNodeCollection} />
</div>), document.getElementById('root'));
diff --git a/src/documents/Documents.ts b/src/documents/Documents.ts
index bba678bbd..442fb00c7 100644
--- a/src/documents/Documents.ts
+++ b/src/documents/Documents.ts
@@ -77,7 +77,7 @@ export namespace Documents {
collectionProto.SetField(KeyStore.Y, new NumberField(0));
collectionProto.SetField(KeyStore.Width, new NumberField(300));
collectionProto.SetField(KeyStore.Height, new NumberField(300));
- collectionProto.SetField(KeyStore.Layout, new TextField('<CollectionFreeFormView doc={doc} fieldKey={DataKey}/>'));
+ collectionProto.SetField(KeyStore.Layout, new TextField('<CollectionFreeFormView doc={doc} fieldKey={DataKey} isSelected={isSelected}/>'));
collectionProto.SetField(KeyStore.LayoutKeys, new ListField([KeyStore.Data]));
}
return collectionProto;
diff --git a/src/util/SelectionManager.ts b/src/util/SelectionManager.ts
new file mode 100644
index 000000000..2a63248c4
--- /dev/null
+++ b/src/util/SelectionManager.ts
@@ -0,0 +1,39 @@
+import { DocumentView } from "../views/nodes/DocumentView";
+import { observable, action } from "mobx";
+
+export namespace SelectionManager {
+ class Manager {
+ @observable
+ SelectedDocuments: Array<DocumentView> = [];
+
+ @action
+ SelectDoc(doc: DocumentView, ctrlPressed: boolean): void {
+ // if doc is not in SelectedDocuments, add it
+ if (!ctrlPressed) {
+ manager.SelectedDocuments = [];
+ }
+
+ if (manager.SelectedDocuments.indexOf(doc) === -1) {
+ manager.SelectedDocuments.push(doc)
+ }
+ }
+ }
+
+ const manager = new Manager;
+
+ export function SelectDoc(doc: DocumentView, ctrlPressed: boolean): void {
+ manager.SelectDoc(doc, ctrlPressed)
+ }
+
+ export function IsSelected(doc: DocumentView): boolean {
+ return manager.SelectedDocuments.indexOf(doc) !== -1;
+ }
+
+ export function DeselectAll(): void {
+ manager.SelectedDocuments = []
+ }
+
+ export function SelectedDocuments(): Array<DocumentView> {
+ return manager.SelectedDocuments;
+ }
+} \ No newline at end of file
diff --git a/src/viewmodels/DocumentViewModel.ts b/src/viewmodels/DocumentViewModel.ts
index 008275f3c..f3154db54 100644
--- a/src/viewmodels/DocumentViewModel.ts
+++ b/src/viewmodels/DocumentViewModel.ts
@@ -8,4 +8,14 @@ export class DocumentViewModel {
get Doc(): Document {
return this.doc;
}
+
+ private _selected = false;
+
+ get Selected() : boolean {
+ return this._selected;
+ }
+
+ set Selected(isSelected: boolean) {
+ this._selected = isSelected;
+ }
} \ No newline at end of file
diff --git a/src/views/freeformcanvas/CollectionFreeFormView.tsx b/src/views/freeformcanvas/CollectionFreeFormView.tsx
index d5343536d..9a4f5ffa1 100644
--- a/src/views/freeformcanvas/CollectionFreeFormView.tsx
+++ b/src/views/freeformcanvas/CollectionFreeFormView.tsx
@@ -13,6 +13,7 @@ import { SSL_OP_SINGLE_DH_USE } from "constants";
interface IProps {
fieldKey: Key;
doc: Document;
+ isSelected: boolean;
}
@observer
@@ -26,6 +27,10 @@ export class CollectionFreeFormView extends React.Component<IProps> {
@action
onPointerDown = (e: React.PointerEvent): void => {
+ if (!this.props.isSelected) {
+ return;
+ }
+
e.stopPropagation();
if (e.button === 2) {
this._isPointerDown = true;
@@ -54,6 +59,11 @@ export class CollectionFreeFormView extends React.Component<IProps> {
return;
}
const { doc } = this.props;
+
+ // if docView is selected, pan, else dont pan
+ console.log(this.props.isSelected)
+
+
let x = doc.GetFieldValue(KeyStore.PanX, NumberField, Number(0));
let y = doc.GetFieldValue(KeyStore.PanY, NumberField, Number(0));
doc.SetFieldValue(KeyStore.PanX, x + e.movementX, NumberField);
diff --git a/src/views/freeformcanvas/FreeFormCanvas.tsx b/src/views/freeformcanvas/FreeFormCanvas.tsx
index 9ef5ab8f7..de5e88fa1 100644
--- a/src/views/freeformcanvas/FreeFormCanvas.tsx
+++ b/src/views/freeformcanvas/FreeFormCanvas.tsx
@@ -10,6 +10,7 @@ import {DocumentView} from "../nodes/DocumentView";
import {TextField} from "../../fields/TextField";
import {ListField} from "../../fields/ListField";
import {Field} from "../../fields/Field";
+import { SelectionManager } from "../../util/SelectionManager";
interface IProps {
store: NodeCollectionStore;
@@ -34,6 +35,8 @@ export class FreeFormCanvas extends React.Component<IProps> {
document.removeEventListener("pointerup", this.onPointerUp);
document.addEventListener("pointerup", this.onPointerUp);
}
+
+ SelectionManager.DeselectAll()
}
@action
@@ -57,6 +60,7 @@ export class FreeFormCanvas extends React.Component<IProps> {
if (!this._isPointerDown) {
return;
}
+
this.props.store.X += e.movementX;
this.props.store.Y += e.movementY;
}
diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx
index f955a8c39..d6f4b296d 100644
--- a/src/views/nodes/DocumentView.tsx
+++ b/src/views/nodes/DocumentView.tsx
@@ -1,6 +1,6 @@
import { observer } from "mobx-react";
import React = require("react");
-import { computed } from "mobx";
+import { computed, observable } from "mobx";
import { KeyStore, Key } from "../../fields/Key";
import { NumberField } from "../../fields/NumberField";
import { TextField } from "../../fields/TextField";
@@ -10,6 +10,7 @@ import { FieldTextBox } from "../nodes/FieldTextBox"
import { FreeFormCanvas } from "../freeformcanvas/FreeFormCanvas"
import { CollectionFreeFormView } from "../freeformcanvas/CollectionFreeFormView"
import "./NodeView.scss"
+import { SelectionManager } from "../../util/SelectionManager";
const JsxParser = require('react-jsx-parser').default;//TODO Why does this need to be imported like this?
interface IProps {
@@ -18,6 +19,12 @@ interface IProps {
@observer
export class DocumentView extends React.Component<IProps> {
+ private _mainCont = React.createRef<HTMLDivElement>();
+
+ get mainCont(): React.RefObject<HTMLDivElement> {
+ return this._mainCont
+ }
+
@computed
get x(): number {
return this.props.dvm.Doc.GetFieldValue(KeyStore.X, NumberField, Number(0));
@@ -66,6 +73,11 @@ export class DocumentView extends React.Component<IProps> {
return this.props.dvm.Doc.GetFieldValue(KeyStore.LayoutFields, ListField, new Array<Key>());
}
+ @computed
+ get selected() : string {
+ return SelectionManager.IsSelected(this) ? "5px solid black" : "0px"
+ }
+
private _isPointerDown = false;
onPointerDown = (e: React.PointerEvent): void => {
@@ -77,6 +89,7 @@ export class DocumentView extends React.Component<IProps> {
document.removeEventListener("pointerup", this.onPointerUp);
document.addEventListener("pointerup", this.onPointerUp);
}
+ SelectionManager.SelectDoc(this, e.ctrlKey)
}
onPointerUp = (e: PointerEvent): void => {
@@ -102,7 +115,8 @@ export class DocumentView extends React.Component<IProps> {
render() {
let doc = this.props.dvm.Doc;
let bindings: any = {
- doc: doc
+ doc: doc,
+ isSelected: this.selected !== "0px"
};
for (const key of this.layoutKeys) {
bindings[key.Name + "Key"] = key;
@@ -113,11 +127,13 @@ export class DocumentView extends React.Component<IProps> {
bindings[key.Name] = field.GetValue();
}
}
+
return (
- <div className="node" style={{
+ <div className="node" ref={this._mainCont} style={{
transform: this.transform,
width: this.width,
- height: this.height
+ height: this.height,
+ border: this.selected
}} onPointerDown={this.onPointerDown} onContextMenu={
(e) => {
e.preventDefault()
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-07 12:04:26 +0000