aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/nodes
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/nodes')
-rw-r--r--src/client/views/nodes/ComparisonBox.tsx38
-rw-r--r--src/client/views/nodes/DataVizBox/DataVizBox.tsx1
-rw-r--r--src/client/views/nodes/DocumentView.tsx4
-rw-r--r--src/client/views/nodes/FieldView.tsx5
-rw-r--r--src/client/views/nodes/ImageBox.scss41
-rw-r--r--src/client/views/nodes/ImageBox.tsx363
-rw-r--r--src/client/views/nodes/LabelBox.tsx55
-rw-r--r--src/client/views/nodes/RecordingBox/ProgressBar.tsx2
-rw-r--r--src/client/views/nodes/calendarBox/CalendarBox.tsx2
-rw-r--r--src/client/views/nodes/formattedText/FormattedTextBox.tsx23
10 files changed, 36 insertions, 498 deletions
diff --git a/src/client/views/nodes/ComparisonBox.tsx b/src/client/views/nodes/ComparisonBox.tsx
index e686368e9..ef66c2b11 100644
--- a/src/client/views/nodes/ComparisonBox.tsx
+++ b/src/client/views/nodes/ComparisonBox.tsx
@@ -5,7 +5,7 @@ import { IReactionDisposer, action, computed, makeObservable, observable, reacti
import { observer } from 'mobx-react';
import * as React from 'react';
import ReactLoading from 'react-loading';
-import { returnFalse, returnNone, returnTrue, returnZero, setupMoveUpEvents } from '../../../ClientUtils';
+import { imageUrlToBase64, returnFalse, returnNone, returnTrue, returnZero, setupMoveUpEvents } from '../../../ClientUtils';
import { emptyFunction } from '../../../Utils';
import { Doc, Opt } from '../../../fields/Doc';
import { DocData } from '../../../fields/DocSymbols';
@@ -44,7 +44,6 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
constructor(props: FieldViewProps) {
super(props);
makeObservable(this);
- this.setListening();
}
@observable private _inputValue = '';
@@ -366,7 +365,7 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
'Content-Type': 'application/json',
},
});
- this.Document.phoneticTranscription = response.data['transcription'];
+ this.Document.phoneticTranscription = response.data.transcription;
};
/**
@@ -375,7 +374,7 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
* @returns
*/
getYouTubeVideoId = (url: string) => {
- const regExp = /^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=|\?v=)([^#\&\?]*).*/;
+ const regExp = /^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|&v=|\?v=)([^#&?]*).*/;
const match = url.match(regExp);
return match && match[2].length === 11 ? match[2] : null;
};
@@ -393,7 +392,7 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
'Content-Type': 'application/json',
},
});
- return response.data['transcription'];
+ return response.data.transcription;
};
createFlashcardPile(collectionArr: Doc[], gpt: boolean) {
@@ -403,9 +402,9 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
_layout_fitWidth: false,
_layout_autoHeight: true,
});
- newCol['x'] = this.layoutDoc['x'];
- newCol['y'] = NumCast(this.layoutDoc['y']) + 50;
- newCol.type_collection = 'carousel';
+ newCol.x = this.layoutDoc.x;
+ newCol.y = NumCast(this.layoutDoc.y) + 50;
+ newCol.type_collection = CollectionViewType.Carousel as string;
for (let i = 0; i < collectionArr.length; i++) {
DocCast(collectionArr[i])[DocData].embedContainer = newCol;
}
@@ -600,34 +599,17 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
_height: 150,
title: '--snapshot' + NumCast(this.layoutDoc._layout_currentTimecode) + ' image-',
});
- imageSnapshot['x'] = this.layoutDoc['x'];
- imageSnapshot['y'] = this.layoutDoc['y'];
+ imageSnapshot.x = this.layoutDoc.x;
+ imageSnapshot.y = this.layoutDoc.y;
return imageSnapshot;
} catch (error) {
console.log(error);
}
};
- static imageUrlToBase64 = async (imageUrl: string): Promise<string> => {
- try {
- const response = await fetch(imageUrl);
- const blob = await response.blob();
-
- return new Promise((resolve, reject) => {
- const reader = new FileReader();
- reader.readAsDataURL(blob);
- reader.onloadend = () => resolve(reader.result as string);
- reader.onerror = error => reject(error);
- });
- } catch (error) {
- console.error('Error:', error);
- throw error;
- }
- };
-
getImageDesc = async (u: string) => {
try {
- const hrefBase64 = await ComparisonBox.imageUrlToBase64(u);
+ const hrefBase64 = await imageUrlToBase64(u);
const response = await gptImageLabel(hrefBase64, 'Answer the following question as a short flashcard response. Do not include a label.' + (this.dataDoc.text as RichTextField)?.Text);
DocCast(this.dataDoc[this.props.fieldKey + '_0'])[DocData].text = response;
diff --git a/src/client/views/nodes/DataVizBox/DataVizBox.tsx b/src/client/views/nodes/DataVizBox/DataVizBox.tsx
index df6e74d85..3dd568fda 100644
--- a/src/client/views/nodes/DataVizBox/DataVizBox.tsx
+++ b/src/client/views/nodes/DataVizBox/DataVizBox.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { Checkbox } from '@mui/material';
import { Colors, Toggle, ToggleType, Type } from 'browndash-components';
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 23ec42610..04a31fd83 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -545,6 +545,9 @@ export class DocumentViewInternal extends DocComponent<FieldViewProps & Document
return;
}
+ const items = this._props.styleProvider?.(this.Document, this._props, StyleProp.ContextMenuItems) as ContextMenuProps[];
+ items?.forEach(item => ContextMenu.Instance.addItem(item));
+
const customScripts = Cast(this.Document.contextMenuScripts, listSpec(ScriptField), []);
StrListCast(this.Document.contextMenuLabels).forEach((label, i) =>
cm.addItem({ description: label, event: () => customScripts[i]?.script.run({ documentView: this, this: this.Document, scriptContext: this._props.scriptContext }), icon: 'sticky-note' })
@@ -1209,6 +1212,7 @@ export class DocumentView extends DocComponent<DocumentViewProps>() {
public set IsSelected(val) { runInAction(() => { this._selected = val; }); } // prettier-ignore
public get IsSelected() { return this._selected; } // prettier-ignore
+ public get IsContentActive(){ return this._docViewInternal?.isContentActive(); } // prettier-ignore
public get topMost() { return this._props.renderDepth === 0; } // prettier-ignore
public get ContentDiv() { return this._docViewInternal?._contentDiv; } // prettier-ignore
public get ComponentView() { return this._docViewInternal?._componentView; } // prettier-ignore
diff --git a/src/client/views/nodes/FieldView.tsx b/src/client/views/nodes/FieldView.tsx
index 7b652dded..170966471 100644
--- a/src/client/views/nodes/FieldView.tsx
+++ b/src/client/views/nodes/FieldView.tsx
@@ -6,7 +6,6 @@ import { DateField } from '../../../fields/DateField';
import { Doc, Field, FieldType, Opt } from '../../../fields/Doc';
import { List } from '../../../fields/List';
import { ScriptField } from '../../../fields/ScriptField';
-import { WebField } from '../../../fields/URLField';
import { dropActionType } from '../../util/DropActionTypes';
import { Transform } from '../../util/Transform';
import { PinProps } from '../PinFuncs';
@@ -14,9 +13,10 @@ import { ViewBoxInterface } from '../ViewBoxInterface';
import { DocumentView } from './DocumentView';
import { FocusViewOptions } from './FocusViewOptions';
import { OpenWhere } from './OpenWhere';
+import { WebField } from '../../../fields/URLField';
+import { ContextMenuProps } from '../ContextMenuItem';
export type FocusFuncType = (doc: Doc, options: FocusViewOptions) => Opt<number>;
-// eslint-disable-next-line no-use-before-define
export type StyleProviderFuncType = (
doc: Opt<Doc>,
// eslint-disable-next-line no-use-before-define
@@ -24,6 +24,7 @@ export type StyleProviderFuncType = (
property: string
) =>
| Opt<FieldType>
+ | ContextMenuProps[]
| { clipPath: string; jsx: JSX.Element }
| JSX.Element
| JSX.IntrinsicElements
diff --git a/src/client/views/nodes/ImageBox.scss b/src/client/views/nodes/ImageBox.scss
index 4d199b360..3ffda5a35 100644
--- a/src/client/views/nodes/ImageBox.scss
+++ b/src/client/views/nodes/ImageBox.scss
@@ -139,44 +139,3 @@
.imageBox-fadeBlocker-hover {
opacity: 0;
}
-
-.loading-spinner {
- position: absolute;
- display: flex;
- justify-content: center;
- align-items: center;
- height: 100%;
- width: 100%;
- // left: 50%;
- // top: 50%;
- z-index: 200;
- font-size: 20px;
- font-weight: bold;
- color: #17175e;
-}
-
-.check-icon {
- position: absolute;
- right: 40;
- bottom: 10;
- color: green;
- display: inline-block;
- font-size: 20px;
- overflow: hidden;
-}
-
-.redo-icon {
- position: absolute;
- right: 10;
- bottom: 10;
- color: black;
- display: inline-block;
- font-size: 20px;
- overflow: hidden;
-}
-
-@keyframes spin {
- to {
- transform: rotate(360deg);
- }
-}
diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx
index 0571351f0..b384e0059 100644
--- a/src/client/views/nodes/ImageBox.tsx
+++ b/src/client/views/nodes/ImageBox.tsx
@@ -17,13 +17,11 @@ import { Cast, ImageCast, NumCast, RTFCast, StrCast } from '../../../fields/Type
import { ImageField } from '../../../fields/URLField';
import { TraceMobx } from '../../../fields/util';
import { emptyFunction } from '../../../Utils';
-import { gptAPICall, GPTCallType, gptImageLabel } from '../../apis/gpt/GPT';
import { Docs } from '../../documents/Documents';
import { DocumentType } from '../../documents/DocumentTypes';
import { DocUtils, FollowLinkScript } from '../../documents/DocUtils';
import { Networking } from '../../Network';
import { DragManager } from '../../util/DragManager';
-import { dropActionType } from '../../util/DropActionTypes';
import { SnappingManager } from '../../util/SnappingManager';
import { undoable, undoBatch } from '../../util/UndoManager';
import { CollectionFreeFormView } from '../collections/collectionFreeForm/CollectionFreeFormView';
@@ -38,16 +36,8 @@ import { StyleProp } from '../StyleProp';
import { DocumentView } from './DocumentView';
import { FieldView, FieldViewProps } from './FieldView';
import { FocusViewOptions } from './FocusViewOptions';
-import { ImageUtility } from './generativeFill/generativeFillUtils/ImageHandler';
import './ImageBox.scss';
import { OpenWhere } from './OpenWhere';
-// import stringSimilarity from 'string-similarity';
-
-enum quizMode {
- SMART = 'smart',
- NORMAL = 'normal',
- NONE = 'none',
-}
export class ImageEditorData {
// eslint-disable-next-line no-use-before-define
@@ -79,25 +69,24 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
public static LayoutString(fieldKey: string) {
return FieldView.LayoutString(ImageBox, fieldKey);
}
+ _ffref = React.createRef<CollectionFreeFormView>();
private _ignoreScroll = false;
private _forcedScroll = false;
private _dropDisposer?: DragManager.DragDropDisposer;
private _disposers: { [name: string]: IReactionDisposer } = {};
private _getAnchor: (savedAnnotations: Opt<ObservableMap<number, HTMLDivElement[]>>, addAsAnnotation: boolean) => Opt<Doc> = () => undefined;
private _overlayIconRef = React.createRef<HTMLDivElement>();
- private _marqueeref = React.createRef<MarqueeAnnotator>();
private _mainCont: React.RefObject<HTMLDivElement> = React.createRef();
private _annotationLayer: React.RefObject<HTMLDivElement> = React.createRef();
- private _imageRef: HTMLImageElement | null = null; // <video> ref
- @observable private _quizBoxes: Doc[] = [];
+ imageRef: HTMLImageElement | null = null; // <video> ref
+ marqueeref = React.createRef<MarqueeAnnotator>();
+ @observable Loading = false; // bcz: this should be migrated into StylProviderQuiz since it's not fundamental to the imageBox
+
@observable private _searchInput = '';
- @observable private _quizMode = quizMode.NONE;
@observable private _savedAnnotations = new ObservableMap<number, (HTMLDivElement & { marqueeing?: boolean })[]>();
@observable private _curSuffix = '';
@observable private _error = '';
- @observable private _loading = false;
@observable private _isHovering = false; // flag to switch between primary and alternate images on hover
- _ffref = React.createRef<CollectionFreeFormView>();
constructor(props: FieldViewProps) {
super(props);
@@ -109,7 +98,6 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
this._dropDisposer?.();
ele && (this._dropDisposer = DragManager.MakeDropTarget(ele, this.drop.bind(this), this.Document));
};
-
getAnchor = (addAsAnnotation: boolean, pinProps?: PinProps) => {
const visibleAnchor = this._getAnchor?.(this._savedAnnotations, true); // use marquee anchor, otherwise, save zoom/pan as anchor
const anchor =
@@ -314,331 +302,10 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
return cropping;
};
- createCanvas = async () => {
- const canvas = document.createElement('canvas');
- const scaling = 1 / (this._props.NativeDimScaling?.() || 1);
- const w = AnchorMenu.Instance.marqueeWidth * scaling;
- const h = AnchorMenu.Instance.marqueeHeight * scaling;
- canvas.width = w;
- canvas.height = h;
- const ctx = canvas.getContext('2d'); // draw image to canvas. scale to target dimensions
- if (ctx) {
- this._imageRef && ctx.drawImage(this._imageRef, NumCast(this._marqueeref.current?.left) * scaling, NumCast(this._marqueeref.current?.top) * scaling, w, h, 0, 0, w, h);
- }
- const blob = await ImageUtility.canvasToBlob(canvas);
- return ImageBox.selectUrlToBase64(blob);
- };
-
- createSnapshotLink = (imagePath: string, downX?: number, downY?: number) => {
- const url = !imagePath.startsWith('/') ? ClientUtils.CorsProxy(imagePath) : imagePath;
- const width = NumCast(this.layoutDoc._width) || 1;
- const height = NumCast(this.layoutDoc._height);
- const imageSnapshot = Docs.Create.ImageDocument(url, {
- _nativeWidth: Doc.NativeWidth(this.layoutDoc),
- _nativeHeight: Doc.NativeHeight(this.layoutDoc),
- x: NumCast(this.layoutDoc.x) + width,
- y: NumCast(this.layoutDoc.y),
- onClick: FollowLinkScript(),
- _width: 150,
- _height: (height / width) * 150,
- title: '--snapshot' + NumCast(this.layoutDoc._layout_currentTimecode) + ' image-',
- });
- Doc.SetNativeWidth(imageSnapshot[DocData], Doc.NativeWidth(this.layoutDoc));
- Doc.SetNativeHeight(imageSnapshot[DocData], Doc.NativeHeight(this.layoutDoc));
- this._props.addDocument?.(imageSnapshot);
- DocUtils.MakeLink(imageSnapshot, this.getAnchor(true), { link_relationship: 'video snapshot' });
- setTimeout(() => downX !== undefined && downY !== undefined && DocumentView.getFirstDocumentView(imageSnapshot)?.startDragging(downX, downY, dropActionType.move, true));
- };
-
- static selectUrlToBase64 = async (blob: Blob): Promise<string> => {
- try {
- return new Promise((resolve, reject) => {
- const reader = new FileReader();
- reader.readAsDataURL(blob);
- reader.onloadend = () => resolve(reader.result as string);
- reader.onerror = error => reject(error);
- });
- } catch (error) {
- console.error('Error:', error);
- throw error;
- }
- };
-
- /**
- * Calls backend to find any text on an image. Gets the text and the
- * coordinates of the text and creates label boxes at those locations.
- * @param quiz
- * @param i
- */
- pushInfo = async (quiz: quizMode, i?: string) => {
- this._quizMode = quiz;
- this._loading = true;
-
- const img = {
- file: i ? i : this.paths[0],
- drag: i ? 'drag' : 'full',
- smart: quiz,
- };
- const response = await axios.post('http://localhost:105/labels/', img, {
- headers: {
- 'Content-Type': 'application/json',
- },
- });
- if (response.data['boxes'].length != 0) {
- this.createBoxes(response.data['boxes'], response.data['text']);
- } else {
- this._loading = false;
- }
- };
-
- /**
- * Creates label boxes over text on the image to be filled in.
- * @param boxes
- * @param texts
- */
- createBoxes = (boxes: [[[number, number]]], texts: [string]) => {
- for (let i = 0; i < boxes.length; i++) {
- const coords = boxes[i] ? boxes[i] : [];
- const width = coords[1][0] - coords[0][0];
- const height = coords[2][1] - coords[0][1];
- const text = texts[i];
-
- const newCol = Docs.Create.LabelDocument({
- _width: width,
- _height: height,
- _layout_fitWidth: true,
- title: '',
- });
- const scaling = 1 / (this._props.NativeDimScaling?.() || 1);
- newCol.x = coords[0][0] + NumCast(this._marqueeref.current?.left) * scaling;
- newCol.y = coords[0][1] + NumCast(this._marqueeref.current?.top) * scaling;
-
- newCol.zIndex = 1000;
- newCol.forceActive = true;
- newCol.quiz = text;
- newCol.showQuiz = false;
- newCol[DocData].textTransform = 'none';
- this._quizBoxes.push(newCol);
- this.addDocument(newCol);
- this._loading = false;
- }
- };
-
- /**
- * Create flashcards from an image.
- */
- getImageDesc = async () => {
- this._loading = true;
- try {
- const hrefBase64 = await this.createCanvas();
- const response = await gptImageLabel(hrefBase64, 'Make flashcards out of this image with each question and answer labeled as "question" and "answer". Do not label each flashcard and do not include asterisks: ');
- AnchorMenu.Instance.transferToFlashcard(response, NumCast(this.layoutDoc['x']), NumCast(this.layoutDoc['y']));
- } catch (error) {
- console.log('Error', error);
- }
- this._loading = false;
- };
-
- /**
- * Calls the createCanvas and pushInfo methods to convert the
- * image to a form that can be passed to GPT and find the locations
- * of the text.
- */
- makeLabels = async () => {
- try {
- const hrefBase64 = await this.createCanvas();
- this.pushInfo(quizMode.NORMAL, hrefBase64);
- } catch (error) {
- console.log('Error', error);
- }
- };
-
- /**
- * Determines whether two words should be considered
- * the same, allowing minor typos.
- * @param str1
- * @param str2
- * @returns
- */
- levenshteinDistance = (str1: string, str2: string) => {
- const len1 = str1.length;
- const len2 = str2.length;
- const dp = Array.from(Array(len1 + 1), () => Array(len2 + 1).fill(0));
-
- if (len1 === 0) return len2;
- if (len2 === 0) return len1;
-
- for (let i = 0; i <= len1; i++) dp[i][0] = i;
- for (let j = 0; j <= len2; j++) dp[0][j] = j;
-
- for (let i = 1; i <= len1; i++) {
- for (let j = 1; j <= len2; j++) {
- const cost = str1[i - 1] === str2[j - 1] ? 0 : 1;
- dp[i][j] = Math.min(
- dp[i - 1][j] + 1, // deletion
- dp[i][j - 1] + 1, // insertion
- dp[i - 1][j - 1] + cost // substitution
- );
- }
- }
-
- return dp[len1][len2];
- };
-
- /**
- * Different algorithm for determining string similarity.
- * @param str1
- * @param str2
- * @returns
- */
- jaccardSimilarity = (str1: string, str2: string) => {
- const set1 = new Set(str1.split(' '));
- const set2 = new Set(str2.split(' '));
-
- const intersection = new Set([...set1].filter(x => set2.has(x)));
- const union = new Set([...set1, ...set2]);
-
- return intersection.size / union.size;
- };
-
- /**
- * Averages the jaccardSimilarity and levenshteinDistance scores
- * to determine string similarity for the labelboxes answers and
- * the users response.
- * @param str1
- * @param str2
- * @returns
- */
- stringSimilarity(str1: string, str2: string) {
- const levenshteinDist = this.levenshteinDistance(str1, str2);
- const levenshteinScore = 1 - levenshteinDist / Math.max(str1.length, str2.length);
-
- const jaccardScore = this.jaccardSimilarity(str1, str2);
-
- // Combine the scores with a higher weight on Jaccard similarity
- return 0.5 * levenshteinScore + 0.5 * jaccardScore;
- }
-
- @computed get checkIcon() {
- return (
- <Tooltip title={<div className="dash-tooltip">Check</div>}>
- <div className="check-icon" onPointerDown={this.check}>
- <FontAwesomeIcon icon="circle-check" size="lg" />
- </div>
- </Tooltip>
- );
- }
-
- @computed get redoIcon() {
- return (
- <Tooltip title={<div className="dash-tooltip">Redo</div>}>
- <div className="redo-icon" onPointerDown={this.redo}>
- <FontAwesomeIcon icon="redo-alt" size="lg" />
- </div>
- </Tooltip>
- );
- }
-
- /**
- * Returns whether two strings are similar
- * @param input
- * @param target
- * @returns
- */
- compareWords = (input: string, target: string) => {
- const distance = this.stringSimilarity(input.toLowerCase(), target.toLowerCase());
- return distance >= 0.7;
- };
-
- /**
- * GPT returns a hex color for what color the label box should be based on
- * the correctness of the users answer.
- * @param inputString
- * @returns
- */
- extractHexAndSentences = (inputString: string) => {
- // Regular expression to match a hexadecimal number at the beginning followed by a period and sentences
- const regex = /^#([0-9A-Fa-f]+)\.\s*(.+)$/s;
- const match = inputString.match(regex);
-
- if (match) {
- const hexNumber = match[1];
- const sentences = match[2].trim();
- return { hexNumber, sentences };
- } else {
- return { error: 'The input string does not match the expected format.' };
- }
- };
-
- /**
- * Check whether the contents of the label boxes on an image are correct.
- */
- check = () => {
- this._loading = true;
- this._quizBoxes.forEach(async doc => {
- const input = StrCast(doc[DocData].title);
- if (this._quizMode == quizMode.SMART && input) {
- const questionText = 'Question: What was labeled in this image?';
- const rubricText = ' Rubric: ' + StrCast(doc.quiz);
- const queryText =
- questionText +
- ' UserAnswer: ' +
- input +
- '. ' +
- rubricText +
- '. One sentence and evaluate based on meaning, not wording. Provide a hex color at the beginning with a period after it on a scale of green (minor details missed) to red (big error) for how correct the answer is. Example: "#FFFFFF. Pasta is delicious."';
- const response = await gptAPICall(queryText, GPTCallType.QUIZ);
- const hexSent = this.extractHexAndSentences(response);
- doc.quiz = hexSent.sentences?.replace(/UserAnswer/g, "user's answer").replace(/Rubric/g, 'rubric');
- doc.backgroundColor = '#' + hexSent.hexNumber;
- } else {
- const match = this.compareWords(input, StrCast(doc.quiz));
- doc.backgroundColor = match ? '#11c249' : '#eb2d2d';
- }
- doc.showQuiz = true;
- });
- this._loading = false;
- };
-
- redo = () => {
- this._quizBoxes.forEach(doc => {
- doc[DocData].title = '';
- doc.backgroundColor = '#e4e4e4';
- doc.showQuiz = false;
- });
- };
-
- /**
- * Get rid of all the label boxes on the images.
- */
- exitQuizMode = () => {
- this._quizMode = quizMode.NONE;
- this._quizBoxes.forEach(doc => {
- this.removeDocument?.(doc);
- });
- this._quizBoxes = [];
- };
-
- @action
- setRef = (iref: HTMLImageElement | null) => {
- this._imageRef = iref;
- };
-
specificContextMenu = (): void => {
const field = Cast(this.dataDoc[this.fieldKey], ImageField);
if (field) {
const funcs: ContextMenuProps[] = [];
- const quizes: ContextMenuProps[] = [];
- quizes.push({
- description: 'Smart Check',
- event: this._quizMode == quizMode.NONE ? () => this.pushInfo(quizMode.SMART) : this.exitQuizMode,
- icon: 'pen-to-square',
- });
- quizes.push({
- description: 'Normal',
- event: this._quizMode == quizMode.NONE ? () => this.pushInfo(quizMode.NORMAL) : this.exitQuizMode,
- icon: 'pencil',
- });
funcs.push({ description: 'Rotate Clockwise 90', event: this.rotate, icon: 'redo-alt' });
funcs.push({ description: `Show ${this.layoutDoc._showFullRes ? 'Dynamic Res' : 'Full Res'}`, event: this.resolution, icon: 'expand' });
funcs.push({ description: 'Set Native Pixel Size', event: this.setNativeSize, icon: 'expand-arrows-alt' });
@@ -653,7 +320,6 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
}),
icon: 'pencil-alt',
});
- ContextMenu.Instance?.addItem({ description: 'Quiz Mode', subitems: quizes, icon: 'file-pen' });
ContextMenu.Instance?.addItem({ description: 'Options...', subitems: funcs, icon: 'asterisk' });
}
};
@@ -769,7 +435,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
<div className="imageBox-fader" style={{ opacity: backAlpha }}>
<img
alt=""
- ref={this.setRef}
+ ref={action((r: HTMLImageElement | null) => (this.imageRef = r))}
key="paths"
src={srcpath}
style={{ transform, transformOrigin }}
@@ -810,7 +476,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
e,
action(moveEv => {
MarqueeAnnotator.clearAnnotations(this._savedAnnotations);
- this._marqueeref.current?.onInitiateSelection([moveEv.clientX, moveEv.clientY]);
+ this.marqueeref.current?.onInitiateSelection([moveEv.clientX, moveEv.clientY]);
return true;
}),
returnFalse,
@@ -822,12 +488,11 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
@action
finishMarquee = () => {
this._getAnchor = AnchorMenu.Instance?.GetAnchor;
- AnchorMenu.Instance.gptFlashcards = this.getImageDesc;
+ this._props.styleProvider?.(this.Document, this._props, StyleProp.AnchorMenuItems);
AnchorMenu.Instance.addToCollection = this._props.DocumentView?.()._props.addDocument;
- AnchorMenu.Instance.makeLabels = this.makeLabels;
- AnchorMenu.Instance.marqueeWidth = this._marqueeref.current?.Width ?? 0;
- AnchorMenu.Instance.marqueeHeight = this._marqueeref.current?.Height ?? 0;
- this._marqueeref.current?.onTerminateSelection();
+ AnchorMenu.Instance.marqueeWidth = this.marqueeref.current?.Width ?? 0;
+ AnchorMenu.Instance.marqueeHeight = this.marqueeref.current?.Height ?? 0;
+ this.marqueeref.current?.onTerminateSelection();
this._props.select(false);
};
focus = (anchor: Doc, options: FocusViewOptions) => (anchor.type === DocumentType.CONFIG ? undefined : this._ffref.current?.focus(anchor, options));
@@ -888,7 +553,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
addDocument={this.addDocument}>
{this.content}
</CollectionFreeFormView>
- {this._loading ? (
+ {this.Loading ? (
<div className="loading-spinner" style={{ position: 'absolute' }}>
<ReactLoading type="spin" height={50} width={50} color={'blue'} />
</div>
@@ -897,7 +562,7 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
{!this._mainCont.current || !this.DocumentView || !this._annotationLayer.current ? null : (
<MarqueeAnnotator
Document={this.Document}
- ref={this._marqueeref}
+ ref={this.marqueeref}
scrollTop={0}
annotationLayerScrollTop={0}
scaling={returnOne}
@@ -914,8 +579,6 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
// anchorMenuFlashcard={() => this.getImageDesc()}
/>
)}
- {this._quizMode != quizMode.NONE ? this.checkIcon : null}
- {this._quizMode != quizMode.NONE ? this.redoIcon : null}
</div>
);
}
diff --git a/src/client/views/nodes/LabelBox.tsx b/src/client/views/nodes/LabelBox.tsx
index 058932457..696ba5697 100644
--- a/src/client/views/nodes/LabelBox.tsx
+++ b/src/client/views/nodes/LabelBox.tsx
@@ -1,12 +1,8 @@
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Tooltip } from '@mui/material';
import { Property } from 'csstype';
-import { action, computed, makeObservable, observable } from 'mobx';
+import { action, computed, makeObservable } from 'mobx';
import { observer } from 'mobx-react';
import * as React from 'react';
import * as textfit from 'textfit';
-import { returnFalse, setupMoveUpEvents } from '../../../ClientUtils';
-import { emptyFunction } from '../../../Utils';
import { Field, FieldType } from '../../../fields/Doc';
import { BoolCast, NumCast, StrCast } from '../../../fields/Types';
import { TraceMobx } from '../../../fields/util';
@@ -26,7 +22,6 @@ export class LabelBox extends ViewBoxBaseComponent<FieldViewProps>() {
}
private dropDisposer?: DragManager.DragDropDisposer;
private _timeout: NodeJS.Timeout | undefined;
- @observable private _editLabel = false;
_divRef: HTMLDivElement | null = null;
constructor(props: FieldViewProps) {
@@ -49,48 +44,6 @@ export class LabelBox extends ViewBoxBaseComponent<FieldViewProps>() {
return this._props.styleProvider?.(this.Document, this._props, StyleProp.BackgroundColor) as string;
}
- @computed get answerIcon() {
- return (
- <Tooltip
- title={
- <div className="answer-tooltip" style={{ minWidth: '150px' }}>
- {StrCast(this.Document.quiz)}
- </div>
- }>
- <div className="answer-tool-tip">
- <FontAwesomeIcon className="q-icon" icon="circle" color="white" />
- <FontAwesomeIcon className="answer-icon" icon="question" />
- </div>
- </Tooltip>
- );
- }
-
- @computed get editAnswer() {
- return (
- <Tooltip
- title={
- <div className="answer-tooltip" style={{ minWidth: '150px' }}>
- {this._editLabel ? 'save' : 'edit correct answer'}
- </div>
- }>
- <div className="answer-tool-tip" onPointerDown={e => setupMoveUpEvents(e.target, e, returnFalse, emptyFunction, () => this.editLabelAnswer())}>
- <FontAwesomeIcon className="edit-icon" color={this._editLabel ? 'white' : 'black'} icon="pencil" size="sm" />
- </div>
- </Tooltip>
- );
- }
-
- editLabelAnswer = () => {
- // when click the pencil, set the text to the quiz content. when click off, set the quiz text to that and set textbox to nothing.
- if (!this._editLabel) {
- this.dataDoc.title = StrCast(this.Document.quiz);
- } else {
- this.Document.quiz = this.Title;
- this.dataDoc.title = '';
- }
- this._editLabel = !this._editLabel;
- };
-
componentDidMount() {
this._props.setContentViewBox?.(this);
}
@@ -98,8 +51,6 @@ export class LabelBox extends ViewBoxBaseComponent<FieldViewProps>() {
this._timeout && clearTimeout(this._timeout);
}
- specificContextMenu = (): void => {};
-
drop = (/* e: Event, de: DragManager.DropEvent */) => {
return false;
};
@@ -152,7 +103,7 @@ export class LabelBox extends ViewBoxBaseComponent<FieldViewProps>() {
const boxParams = this.fitTextToBox(undefined); // this causes mobx to trigger re-render when data changes
const label = this.Title.startsWith('#') ? null : this.Title;
return (
- <div key={label?.length} className="labelBox-outerDiv" ref={this.createDropTarget} onContextMenu={this.specificContextMenu} style={{ boxShadow: this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.BoxShadow) as string }}>
+ <div key={label?.length} className="labelBox-outerDiv" ref={this.createDropTarget} style={{ boxShadow: this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.BoxShadow) as string }}>
<div
className="labelBox-mainButton"
style={{
@@ -203,8 +154,6 @@ export class LabelBox extends ViewBoxBaseComponent<FieldViewProps>() {
{label}
</div>
</div>
- {this.Document.showQuiz ? this.answerIcon : null}
- {this.Document.showQuiz ? this.editAnswer : null}
</div>
);
}
diff --git a/src/client/views/nodes/RecordingBox/ProgressBar.tsx b/src/client/views/nodes/RecordingBox/ProgressBar.tsx
index 62798bc2f..7e91df7ab 100644
--- a/src/client/views/nodes/RecordingBox/ProgressBar.tsx
+++ b/src/client/views/nodes/RecordingBox/ProgressBar.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable react/no-array-index-key */
-/* eslint-disable react/require-default-props */
import * as React from 'react';
import { useEffect, useState, useRef } from 'react';
import './ProgressBar.scss';
diff --git a/src/client/views/nodes/calendarBox/CalendarBox.tsx b/src/client/views/nodes/calendarBox/CalendarBox.tsx
index 678b7dd0b..d38cb5423 100644
--- a/src/client/views/nodes/calendarBox/CalendarBox.tsx
+++ b/src/client/views/nodes/calendarBox/CalendarBox.tsx
@@ -1,4 +1,4 @@
-import { Calendar, DateInput, EventClickArg, EventSourceInput } from '@fullcalendar/core';
+import { Calendar, EventClickArg, EventSourceInput } from '@fullcalendar/core';
import dayGridPlugin from '@fullcalendar/daygrid';
import multiMonthPlugin from '@fullcalendar/multimonth';
import timeGrid from '@fullcalendar/timegrid';
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index 865146d68..c89737e1e 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -13,7 +13,7 @@ import { EditorState, NodeSelection, Plugin, Selection, TextSelection, Transacti
import { EditorView, NodeViewConstructor } from 'prosemirror-view';
import * as React from 'react';
import { BsMarkdownFill } from 'react-icons/bs';
-import { addStyleSheet, addStyleSheetRule, clearStyleSheetRules, ClientUtils, DivWidth, returnFalse, returnZero, setupMoveUpEvents, simMouseEvent, smoothScroll, StopEvent } from '../../../../ClientUtils';
+import { addStyleSheet, addStyleSheetRule, clearStyleSheetRules, ClientUtils, DivWidth, imageUrlToBase64, returnFalse, returnZero, setupMoveUpEvents, simMouseEvent, smoothScroll, StopEvent } from '../../../../ClientUtils';
import { DateField } from '../../../../fields/DateField';
import { CreateLinkToActiveAudio, Doc, DocListCast, Field, FieldType, Opt, StrListCast } from '../../../../fields/Doc';
import { AclAdmin, AclAugment, AclEdit, AclSelfEdit, DocCss, DocData, ForceServerWrite, UpdatingFromServer } from '../../../../fields/DocSymbols';
@@ -1008,30 +1008,13 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
// console.log('HI' + this.ProseRef?.getElementsByTagName('img'));
};
- static imageUrlToBase64 = async (imageUrl: string): Promise<string> => {
- try {
- const response = await fetch(imageUrl);
- const blob = await response.blob();
-
- return new Promise((resolve, reject) => {
- const reader = new FileReader();
- reader.readAsDataURL(blob);
- reader.onloadend = () => resolve(reader.result as string);
- reader.onerror = error => reject(error);
- });
- } catch (error) {
- console.error('Error:', error);
- throw error;
- }
- };
-
getImageDesc = async (u: string) => {
// if (StrCast(this.dataDoc.description)) return StrCast(this.dataDoc.description); // Return existing description
// const { href } = (u as URLField).url;
const hrefParts = u.split('.');
const hrefComplete = `${hrefParts[0]}_o.${hrefParts[1]}`;
try {
- const hrefBase64 = await FormattedTextBox.imageUrlToBase64(u);
+ const hrefBase64 = await imageUrlToBase64(u);
const response = await gptImageLabel(
hrefBase64,
'Make flashcards out of this text and image with each question and answer labeled as question and answer. Do not label each flashcard and do not include asterisks: ' + (this.dataDoc.text as RichTextField)?.Text
@@ -1270,7 +1253,7 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
};
@computed get tagsHeight() {
- return this.DocumentView?.().showTags ? Math.max(0, 20 - Math.max(this._props.yPadding ?? 0, NumCast(this.layoutDoc._yMargin))) : 0;
+ return this.DocumentView?.().showTags ? Math.max(0, 20 - Math.max(this._props.yPadding ?? 0, NumCast(this.layoutDoc._yMargin))) * this.ScreenToLocalBoxXf().Scale : 0;
}
@computed get contentScaling() {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-08 00:14:37 +0000