aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/views/PropertiesButtons.scss13
-rw-r--r--src/client/views/PropertiesButtons.tsx29
-rw-r--r--src/client/views/collections/CollectionMenu.scss19
-rw-r--r--src/client/views/collections/CollectionTreeView.tsx2
-rw-r--r--src/client/views/collections/CollectionView.tsx2
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.scss24
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.tsx33
-rw-r--r--src/client/views/nodes/DocumentView.tsx8
-rw-r--r--src/client/views/nodes/FontIconBox.scss2
-rw-r--r--src/client/views/nodes/FontIconBox.tsx23
-rw-r--r--src/client/views/nodes/LabelBox.tsx2
11 files changed, 103 insertions, 54 deletions
diff --git a/src/client/views/PropertiesButtons.scss b/src/client/views/PropertiesButtons.scss
index e099122c4..b3a317a6b 100644
--- a/src/client/views/PropertiesButtons.scss
+++ b/src/client/views/PropertiesButtons.scss
@@ -77,10 +77,19 @@ $linkGap : 3px;
text-align: center;
border-radius: 5px;
pointer-events: auto;
- color: $dark-color;
- border: $dark-color 1px solid;
+ // color: $dark-color;
+ // border: $dark-color 1px solid;
+ background-color: #252b33;
+ color: #fcfbf7;
transition: 0.2s ease all;
margin-right: 5px;
+ padding-top: 5px;
+
+ &:hover {
+ background: $main-accent;
+ transform: scale(1.05);
+ cursor: pointer;
+ }
}
.propertiesButtons-linker:hover {
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 59e7cc7c8..d3f056a34 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -208,7 +208,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
const isPinned = targetDoc && Doc.isDocPinned(targetDoc);
return !targetDoc ? (null) : <Tooltip title={<><div className="dash-tooltip">{Doc.isDocPinned(targetDoc) ? "Unpin from presentation" : "Pin to presentation"}</div></>}>
<div className="propertiesButtons-linker"
- style={{ backgroundColor: isPinned ? "white" : "rgb(37, 43, 51)", color: isPinned ? "black" : "white" }}
+ style={{ backgroundColor: isPinned ? "white" : "", color: isPinned ? "black" : "white" }}
onClick={e => DockedFrameRenderer.PinDoc(targetDoc, isPinned)}>
<FontAwesomeIcon className="documentdecorations-icon" size="sm" icon="map-pin"
/>
@@ -238,6 +238,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
onAliasButtonDown = (e: React.PointerEvent): void => {
setupMoveUpEvents(this, e, this.onAliasButtonMoved, emptyFunction, emptyFunction);
}
+ @undoBatch
onAliasButtonMoved = () => {
if (this._dragRef.current) {
const dragDocView = this.selectedDocumentView!;
@@ -273,12 +274,17 @@ export class PropertiesButtons extends React.Component<{}, {}> {
</div></Tooltip>;
}
+ @undoBatch
onCopy = () => {
if (this.selectedDoc && this.selectedDocumentView) {
- const copy = Doc.MakeCopy(this.selectedDocumentView.props.Document, true);
- copy.x = NumCast(this.selectedDoc.x) + NumCast(this.selectedDoc._width);
- copy.y = NumCast(this.selectedDoc.y) + 30;
- this.selectedDocumentView.props.addDocument?.(copy);
+ // const copy = Doc.MakeCopy(this.selectedDocumentView.props.Document, true);
+ // copy.x = NumCast(this.selectedDoc.x) + NumCast(this.selectedDoc._width);
+ // copy.y = NumCast(this.selectedDoc.y) + 30;
+ // this.selectedDocumentView.props.addDocument?.(copy);
+ const alias = Doc.MakeAlias(this.selectedDoc);
+ alias.x = NumCast(this.selectedDoc.x) + NumCast(this.selectedDoc._width);
+ alias.y = NumCast(this.selectedDoc.y) + 30;
+ this.selectedDocumentView.props.addDocument?.(alias);
}
}
@@ -295,7 +301,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
</Tooltip>;
}
- @action
+ @action @undoBatch
onLock = () => {
this.selectedDocumentView?.toggleLockPosition();
}
@@ -337,15 +343,19 @@ export class PropertiesButtons extends React.Component<{}, {}> {
return !targetDoc ? (null) : <Tooltip
title={<><div className="dash-tooltip">{"Delete Document"}</div></>}>
<div className={"propertiesButtons-linkButton-empty"}
- onPointerDown={() => {
- this.selectedDocumentView?.props.ContainingCollectionView?.removeDocument(this.selectedDocumentView?.props.Document);
- }}>
+ onPointerDown={this.deleteDocument}>
{<FontAwesomeIcon className="propertiesButtons-icon"
icon="trash-alt" size="sm" />}
</div>
</Tooltip>;
}
+ @undoBatch
+ @action
+ deleteDocument = () => {
+ this.selectedDocumentView?.props.ContainingCollectionView?.removeDocument(this.selectedDocumentView?.props.Document);
+ }
+
@computed
get sharingButton() {
const targetDoc = this.selectedDoc;
@@ -380,6 +390,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
}
}
+ @undoBatch
@action
handleOptionChange = (e: any) => {
const value = e.target.value;
diff --git a/src/client/views/collections/CollectionMenu.scss b/src/client/views/collections/CollectionMenu.scss
index 9da204787..0a316317f 100644
--- a/src/client/views/collections/CollectionMenu.scss
+++ b/src/client/views/collections/CollectionMenu.scss
@@ -2,8 +2,8 @@
.collectionMenu-cont {
- position:relative;
- display:inline-flex;
+ position: relative;
+ display: inline-flex;
width: 100%;
opacity: 0.9;
z-index: 9001;
@@ -12,14 +12,15 @@
color: white;
transform-origin: top left;
top: 0;
- width:100%;
+ width: 100%;
.antimodeMenu-button {
padding: 0;
width: 30px;
display: flex;
+
svg {
- margin:auto;
+ margin: auto;
}
}
@@ -108,6 +109,7 @@
margin-top: auto;
margin-bottom: auto;
}
+
.collectionViewBaseChrome-viewSpecs {
margin-left: 5px;
display: grid;
@@ -318,12 +320,14 @@
text-align: center;
display: block;
}
+
.color-previewI {
width: 80%;
height: 20%;
bottom: 0;
position: absolute;
}
+
.color-previewII {
width: 80%;
height: 80%;
@@ -336,7 +340,7 @@
margin: auto;
/* Make the buttons appear below each other */
}
-
+
.btn-draw {
display: inline-flex;
margin: auto;
@@ -374,6 +378,7 @@
display: block;
margin: auto;
}
+
border-right: solid gray 1px;
}
}
@@ -398,14 +403,14 @@
.collectionSchemaViewChrome-toggler {
width: 100px;
- height: 41px;
+ height: 35px;
background-color: black;
position: relative;
}
.collectionSchemaViewChrome-togglerButton {
width: 47px;
- height: 35px;
+ height: 30px;
background-color: $light-color-secondary;
// position: absolute;
transition: all 0.5s ease;
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index 7787a8b38..3c7471d7c 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -785,7 +785,7 @@ export class CollectionTreeView extends CollectionSubView<Document, Partial<coll
onClicks.push({
description: "Edit onChecked Script", event: () => UndoManager.RunInBatch(() => DocUtils.makeCustomViewClicked(this.doc, undefined, "onCheckedClick"), "edit onCheckedClick"), icon: "edit"
});
- !existingOnClick && ContextMenu.Instance.addItem({ description: "OnClick...", noexpand: true, subitems: onClicks, icon: "hand-point-right" });
+ !existingOnClick && ContextMenu.Instance.addItem({ description: "OnClick...", noexpand: true, subitems: onClicks, icon: "mouse-pointer" });
}
outerXf = () => Utils.GetScreenTransform(this._mainEle!);
onTreeDrop = (e: React.DragEvent) => this.onExternalDrop(e, {});
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index c2b55d38e..89034a0c0 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -339,7 +339,7 @@ export class CollectionView extends Touchable<FieldViewProps & CollectionViewCus
icon: "edit",
event: () => Doc.GetProto(this.props.Document)[StrCast(childClick.targetScriptKey)] = ObjectField.MakeCopy(ScriptCast(childClick.data)),
}));
- !existingOnClick && cm.addItem({ description: "OnClick...", noexpand: true, subitems: onClicks, icon: "hand-point-right" });
+ !existingOnClick && cm.addItem({ description: "OnClick...", noexpand: true, subitems: onClicks, icon: "mouse-pointer" });
if (!Doc.UserDoc().noviceMode) {
const more = cm.findByDescription("More...");
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.scss b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
index a96716659..7df56115f 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.scss
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
@@ -60,6 +60,10 @@
padding-left: 8px;
background-color: rgb(51, 51, 51);
+ &:hover {
+ cursor: pointer;
+ }
+
.propertiesView-settings-title-icon {
float: right;
right: 0;
@@ -94,6 +98,10 @@
padding-left: 8px;
background-color: rgb(51, 51, 51);
+ &:hover {
+ cursor: pointer;
+ }
+
.propertiesView-sharing-title-icon {
float: right;
right: 0;
@@ -127,6 +135,10 @@
padding-left: 8px;
background-color: rgb(51, 51, 51);
+ &:hover {
+ cursor: pointer;
+ }
+
.propertiesView-appearance-title-icon {
float: right;
right: 0;
@@ -160,6 +172,10 @@
padding-left: 8px;
background-color: rgb(51, 51, 51);
+ &:hover {
+ cursor: pointer;
+ }
+
.propertiesView-transform-title-icon {
float: right;
right: 0;
@@ -287,6 +303,10 @@
padding-left: 8px;
background-color: rgb(51, 51, 51);
+ &:hover {
+ cursor: pointer;
+ }
+
.propertiesView-fields-title-name {
font-size: 12.5px;
font-weight: bold;
@@ -362,6 +382,10 @@
padding-left: 8px;
background-color: rgb(51, 51, 51);
+ &:hover {
+ cursor: pointer;
+ }
+
.propertiesView-layout-title-icon {
float: right;
right: 0;
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
index 73f0f1bdd..0168c825f 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
@@ -205,7 +205,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
}
}
-
+ @undoBatch
setKeyValue = (value: string) => {
if (this.selectedDoc && this.dataDoc) {
const doc = this.layoutFields ? Doc.Layout(this.selectedDoc) : this.dataDoc;
@@ -266,9 +266,14 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
}
}
+ @undoBatch
+ changePermissions = (e: any, user: string) => {
+ SharingManager.Instance.shareFromPropertiesSidebar(user, e.currentTarget.value as SharingPermissions, this.selectedDoc!);
+ }
+
getPermissionsSelect(user: string) {
return <select className="permissions-select"
- onChange={e => SharingManager.Instance.shareFromPropertiesSidebar(user, e.currentTarget.value as SharingPermissions, this.selectedDoc!)}>
+ onChange={e => this.changePermissions(e, user)}>
{Object.values(SharingPermissions).map(permission => {
return (
<option key={permission} value={permission} selected={this.selectedDoc![`ACL-${user.replace(".", "_")}`] === permission}>
@@ -344,6 +349,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
/>;
}
+ @undoBatch
@action
toggleCheckbox = () => {
this.layoutFields = !this.layoutFields;
@@ -359,6 +365,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
SetValue={this.setTitle} />;
}
+ @undoBatch
@action
setTitle = (value: string) => {
if (this.dataDoc) {
@@ -370,13 +377,6 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
}
-
-
-
-
-
-
-
@undoBatch
@action
rotate = (angle: number) => {
@@ -739,9 +739,13 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
if (!this.selectedDoc) {
return <div className="propertiesView" style={{ width: this.props.width }}>
- <div className="propertiesView-title" style={{ width: this.props.width, paddingLeft: 6 }}>
+ <div className="propertiesView-title" style={{ width: this.props.width }}>
No Document Selected
- </div> </div>;
+ <div className="propertiesView-title-icon" onPointerDown={this.props.onDown}>
+ <FontAwesomeIcon icon="times" color="black" size="xs" />
+ </div>
+ </div>
+ </div>;
}
const novice = Doc.UserDoc().noviceMode;
@@ -783,9 +787,6 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
</div> : null}
</div>
-
-
-
{this.isInk ? <div className="propertiesView-appearance">
<div className="propertiesView-appearance-title"
onPointerDown={() => runInAction(() => { this.openAppearance = !this.openAppearance; })}
@@ -814,10 +815,6 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
</div> : null}
</div> : null}
-
-
-
-
<div className="propertiesView-fields">
<div className="propertiesView-fields-title"
onPointerDown={() => runInAction(() => { this.openFields = !this.openFields; })}
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 30382a4ef..ec0a5f3ac 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -677,10 +677,10 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
@action
onCopy = () => {
- const copy = Doc.MakeCopy(this.props.Document, true);
- copy.x = NumCast(this.props.Document.x) + NumCast(this.props.Document._width);
- copy.y = NumCast(this.props.Document.y) + 30;
- this.props.addDocument?.(copy);
+ const alias = Doc.MakeAlias(this.props.Document);
+ alias.x = NumCast(this.props.Document.x) + NumCast(this.props.Document._width);
+ alias.y = NumCast(this.props.Document.y) + 30;
+ this.props.addDocument?.(alias);
}
@action
diff --git a/src/client/views/nodes/FontIconBox.scss b/src/client/views/nodes/FontIconBox.scss
index 13af511a6..a142d873a 100644
--- a/src/client/views/nodes/FontIconBox.scss
+++ b/src/client/views/nodes/FontIconBox.scss
@@ -33,7 +33,7 @@
padding-left: 5px;
width: 100%;
width: 60px;
- height: 70px;
+ height: 60px;
padding-top: 3px;
padding-bottom: 3px;
diff --git a/src/client/views/nodes/FontIconBox.tsx b/src/client/views/nodes/FontIconBox.tsx
index 720d6a15d..7c538df92 100644
--- a/src/client/views/nodes/FontIconBox.tsx
+++ b/src/client/views/nodes/FontIconBox.tsx
@@ -66,18 +66,21 @@ export class FontIconBox extends DocComponent<FieldViewProps, FontIconDocument>(
if (this.layoutDoc.menuIcon) {
- let backgroundColor = "black";
- if (this.dataDoc.title === "Sharing" || this.dataDoc.title === "Help" || this.dataDoc.title === "Settings" || this.dataDoc.title === "Import") {
- backgroundColor = "black";
- } else {
- backgroundColor = CurrentUserUtils.selectedPanel === this.dataDoc.title ? "lightgrey" : "black";
- }
+ // let backgroundColor = "black";
+ // if (this.dataDoc.title === "Sharing" || this.dataDoc.title === "Help" || this.dataDoc.title === "Settings" || this.dataDoc.title === "Import") {
+ // backgroundColor = "black";
+ // } else {
+ // backgroundColor = CurrentUserUtils.selectedPanel === this.dataDoc.title ? "lightgrey" : "";
+ // }
- const color = backgroundColor === "lightgrey" ? "black" : "white";
- const menuBTN = <div className="menuButton" style={{ backgroundColor: backgroundColor }}>
+ const color = CurrentUserUtils.selectedPanel === this.dataDoc.title ? "black" : "white";
+ const menuBTN = <div className="menuButton"
+ style={{ backgroundColor: CurrentUserUtils.selectedPanel === this.dataDoc.title ? "lightgrey" : "" }}>
- <div className="menuButton-wrap" style={{ backgroundColor: backgroundColor }}>
- <FontAwesomeIcon className="menuButton-icon" icon={StrCast(this.dataDoc.icon, "user") as any} color={color} size="lg" />
+ <div className="menuButton-wrap"
+ style={{ backgroundColor: CurrentUserUtils.selectedPanel === this.dataDoc.title ? "lightgrey" : "" }}>
+ <FontAwesomeIcon className="menuButton-icon"
+ icon={StrCast(this.dataDoc.icon, "user") as any} color={color} size="lg" />
<div className="menuButton-label" style={{ color: color }}> {this.dataDoc.title} </div>
</div>
</div>;
diff --git a/src/client/views/nodes/LabelBox.tsx b/src/client/views/nodes/LabelBox.tsx
index 0dfbdc5cf..05ba6628c 100644
--- a/src/client/views/nodes/LabelBox.tsx
+++ b/src/client/views/nodes/LabelBox.tsx
@@ -41,7 +41,7 @@ export class LabelBox extends ViewBoxBaseComponent<FieldViewProps, LabelDocument
}, icon: "trash"
});
- ContextMenu.Instance.addItem({ description: "OnClick...", noexpand: true, subitems: funcs, icon: "asterisk" });
+ ContextMenu.Instance.addItem({ description: "OnClick...", noexpand: true, subitems: funcs, icon: "mouse-pointer" });
}
@undoBatch
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 17:51:20 +0000