aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/views/DictationOverlay.tsx60
-rw-r--r--src/client/views/LightboxView.tsx1
-rw-r--r--src/client/views/MainView.scss5
-rw-r--r--src/client/views/MainView.tsx1
-rw-r--r--src/client/views/PreviewCursor.scss5
-rw-r--r--src/client/views/PreviewCursor.tsx3
-rw-r--r--src/client/views/nodes/formattedText/RichTextRules.ts10
7 files changed, 51 insertions, 34 deletions
diff --git a/src/client/views/DictationOverlay.tsx b/src/client/views/DictationOverlay.tsx
index f4f96da8a..0bdcdc303 100644
--- a/src/client/views/DictationOverlay.tsx
+++ b/src/client/views/DictationOverlay.tsx
@@ -1,9 +1,8 @@
import { computed, observable, runInAction } from 'mobx';
import { observer } from 'mobx-react';
-import "normalize.css";
import * as React from 'react';
import { DictationManager } from '../util/DictationManager';
-import "./Main.scss";
+import './Main.scss';
import { MainViewModal } from './MainViewModal';
@observer
@@ -29,44 +28,53 @@ export class DictationOverlay extends React.Component {
this.dictationOverlayVisible = false;
this.dictationSuccess = undefined;
DictationOverlay.Instance.hasActiveModal = false;
- setTimeout(() => this.dictatedPhrase = DictationManager.placeholder, 500);
+ setTimeout(() => (this.dictatedPhrase = DictationManager.placeholder), 500);
}, duration);
- }
+ };
public cancelDictationFade = () => {
if (this.overlayTimeout) {
clearTimeout(this.overlayTimeout);
this.overlayTimeout = undefined;
}
- }
+ };
- @computed public get dictatedPhrase() { return this._dictationState; }
- @computed public get dictationSuccess() { return this._dictationSuccessState; }
- @computed public get dictationOverlayVisible() { return this._dictationDisplayState; }
- @computed public get isListening() { return this._dictationListeningState; }
+ @computed public get dictatedPhrase() {
+ return this._dictationState;
+ }
+ @computed public get dictationSuccess() {
+ return this._dictationSuccessState;
+ }
+ @computed public get dictationOverlayVisible() {
+ return this._dictationDisplayState;
+ }
+ @computed public get isListening() {
+ return this._dictationListeningState;
+ }
- public set dictatedPhrase(value: string) { runInAction(() => this._dictationState = value); }
- public set dictationSuccess(value: boolean | undefined) { runInAction(() => this._dictationSuccessState = value); }
- public set dictationOverlayVisible(value: boolean) { runInAction(() => this._dictationDisplayState = value); }
- public set isListening(value: DictationManager.Controls.ListeningUIStatus) { runInAction(() => this._dictationListeningState = value); }
+ public set dictatedPhrase(value: string) {
+ runInAction(() => (this._dictationState = value));
+ }
+ public set dictationSuccess(value: boolean | undefined) {
+ runInAction(() => (this._dictationSuccessState = value));
+ }
+ public set dictationOverlayVisible(value: boolean) {
+ runInAction(() => (this._dictationDisplayState = value));
+ }
+ public set isListening(value: DictationManager.Controls.ListeningUIStatus) {
+ runInAction(() => (this._dictationListeningState = value));
+ }
render() {
const success = this.dictationSuccess;
const result = this.isListening && !this.isListening.interim ? DictationManager.placeholder : `"${this.dictatedPhrase}"`;
const dialogueBoxStyle = {
- background: success === undefined ? "gainsboro" : success ? "lawngreen" : "red",
- borderColor: this.isListening ? "red" : "black",
- fontStyle: "italic"
+ background: success === undefined ? 'gainsboro' : success ? 'lawngreen' : 'red',
+ borderColor: this.isListening ? 'red' : 'black',
+ fontStyle: 'italic',
};
const overlayStyle = {
- backgroundColor: this.isListening ? "red" : "darkslategrey"
+ backgroundColor: this.isListening ? 'red' : 'darkslategrey',
};
- return (<MainViewModal
- contents={result}
- isDisplayed={this.dictationOverlayVisible}
- interactive={false}
- dialogueBoxStyle={dialogueBoxStyle}
- overlayStyle={overlayStyle}
- closeOnExternalClick={this.initiateDictationFade}
- />);
+ return <MainViewModal contents={result} isDisplayed={this.dictationOverlayVisible} interactive={false} dialogueBoxStyle={dialogueBoxStyle} overlayStyle={overlayStyle} closeOnExternalClick={this.initiateDictationFade} />;
}
-} \ No newline at end of file
+}
diff --git a/src/client/views/LightboxView.tsx b/src/client/views/LightboxView.tsx
index 5613e82fb..cb5094f4b 100644
--- a/src/client/views/LightboxView.tsx
+++ b/src/client/views/LightboxView.tsx
@@ -1,7 +1,6 @@
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { action, computed, observable } from 'mobx';
import { observer } from 'mobx-react';
-import 'normalize.css';
import * as React from 'react';
import { Doc, DocListCast, Opt } from '../../fields/Doc';
import { InkTool } from '../../fields/InkField';
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index da79d2992..c5ac1cf52 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -1,5 +1,10 @@
@import 'global/globalCssVariables';
@import 'nodeModuleOverrides';
+h1,
+.h1 {
+ // reverts change to h1 made by normalize.css
+ font-size: 36px;
+}
.dash-tooltip {
font-size: 11px;
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index d7b526d22..24dae8816 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -5,6 +5,7 @@ import * as fa from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { action, computed, configure, observable, reaction, runInAction } from 'mobx';
import { observer } from 'mobx-react';
+import 'normalize.css';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { Doc, DocListCast, Opt } from '../../fields/Doc';
diff --git a/src/client/views/PreviewCursor.scss b/src/client/views/PreviewCursor.scss
index 60b7d14a0..7be765ea9 100644
--- a/src/client/views/PreviewCursor.scss
+++ b/src/client/views/PreviewCursor.scss
@@ -1,11 +1,10 @@
-
.previewCursor-Dark,
.previewCursor {
color: black;
position: absolute;
transform-origin: left top;
top: 0;
- left:0;
+ left: 0;
pointer-events: none;
opacity: 1;
z-index: 1001;
@@ -13,4 +12,4 @@
.previewCursor-Dark {
color: white;
-} \ No newline at end of file
+}
diff --git a/src/client/views/PreviewCursor.tsx b/src/client/views/PreviewCursor.tsx
index 4c17d5a97..d56d2a310 100644
--- a/src/client/views/PreviewCursor.tsx
+++ b/src/client/views/PreviewCursor.tsx
@@ -1,10 +1,9 @@
import { action, observable, runInAction } from 'mobx';
import { observer } from 'mobx-react';
-import 'normalize.css';
import * as React from 'react';
import { Doc } from '../../fields/Doc';
import { Cast, NumCast, StrCast } from '../../fields/Types';
-import { emptyFunction, returnFalse } from '../../Utils';
+import { returnFalse } from '../../Utils';
import { DocServer } from '../DocServer';
import { Docs, DocumentOptions, DocUtils } from '../documents/Documents';
import { Transform } from '../util/Transform';
diff --git a/src/client/views/nodes/formattedText/RichTextRules.ts b/src/client/views/nodes/formattedText/RichTextRules.ts
index 2097b321f..2eb62c38d 100644
--- a/src/client/views/nodes/formattedText/RichTextRules.ts
+++ b/src/client/views/nodes/formattedText/RichTextRules.ts
@@ -343,8 +343,14 @@ export class RichTextRules {
const node = (state.doc.resolve(start) as any).nodeAfter;
if (node?.marks.findIndex((m: any) => m.type === schema.marks.user_tag) !== -1) return state.tr.removeMark(start, end, schema.marks.user_tag);
-
- return node ? state.tr.addMark(start, end, schema.marks.user_tag.create({ userid: Doc.CurrentUserEmail, tag: tag, modified: Math.round(Date.now() / 1000 / 60) })) : state.tr;
+ if (node?.marks.findIndex((m: any) => m.type === schema.marks.user_mark) !== -1) {
+ }
+ return node
+ ? state.tr
+ .removeMark(start, end, schema.marks.user_mark)
+ .addMark(start, end, schema.marks.user_mark.create({ userid: Doc.CurrentUserEmail, modified: Math.floor(Date.now() / 1000) }))
+ .addMark(start, end, schema.marks.user_tag.create({ userid: Doc.CurrentUserEmail, tag: tag, modified: Math.round(Date.now() / 1000 / 60) }))
+ : state.tr;
}),
new InputRule(new RegExp(/%\(/), (state, match, start, end) => {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-11-28 20:07:40 +0000