selectCanon(canonList[0])}
diff --git a/renderer/src/components/context/ScribexContext.js b/renderer/src/components/context/ScribexContext.js
index d03fc39cd..b608eec56 100644
--- a/renderer/src/components/context/ScribexContext.js
+++ b/renderer/src/components/context/ScribexContext.js
@@ -17,6 +17,11 @@ const ScribexContextProvider = ({
graftSequenceId: null,
reference,
font,
+ caretPosition: 0,
+ textToInsert: '',
+ numberToInsert: '',
+ selectedText: null,
+ insertType: '',
};
const [state, setState] = useState(initialState);
@@ -53,12 +58,32 @@ const ScribexContextProvider = ({
setState((prev) => ({ ...prev, graftSequenceId }));
}, []);
+ const setCaretPosition = useCallback((caretPosition) => {
+ setState((prev) => ({ ...prev, caretPosition }));
+ }, []);
+
+ const setTextToInsert = useCallback((textToInsert) => {
+ setState((prev) => ({ ...prev, textToInsert }));
+ }, []);
+
+ const setNumberToInsert = useCallback((numberToInsert) => {
+ setState((prev) => ({ ...prev, numberToInsert }));
+ }, []);
+
+ const setSelectedText = useCallback((selectedText) => {
+ setState((prev) => ({ ...prev, selectedText }));
+ }, []);
+
const addSequenceId = useCallback(
(_sequenceId) => {
setSequenceIds([...state.sequenceIds, _sequenceId]);
},
[state.sequenceIds, setSequenceIds],
);
+
+ const setInsertType = useCallback((insertType) => {
+ setState((prev) => ({ ...prev, insertType }));
+}, []);
const actions = {
setFont,
setSectionable,
@@ -69,6 +94,11 @@ const ScribexContextProvider = ({
setSequenceIds,
addSequenceId,
setGraftSequenceId,
+ setCaretPosition,
+ setTextToInsert,
+ setNumberToInsert,
+ setSelectedText,
+ setInsertType,
};
const context = {
diff --git a/renderer/src/hooks/useAutoSaveIndication.js b/renderer/src/hooks/useAutoSaveIndication.js
new file mode 100644
index 000000000..4b6530599
--- /dev/null
+++ b/renderer/src/hooks/useAutoSaveIndication.js
@@ -0,0 +1,24 @@
+import React, { useContext, useEffect } from 'react';
+import { ProjectContext } from '@/components/context/ProjectContext';
+import SaveIndicator from '@/components/Loading/SaveIndicator';
+import { useTranslation } from 'react-i18next';
+
+export const useAutoSaveIndication = (isSaving) => {
+const {
+ actions: { setEditorSave },
+} = useContext(ProjectContext);
+const { t } = useTranslation();
+
+const autoSaveIndication = () => {
+ setEditorSave(
);
+ setTimeout(() => {
+ setEditorSave(t('label-saved'));
+ }, 1000);
+};
+useEffect(() => {
+ if (isSaving) {
+ autoSaveIndication();
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+}, [isSaving]);
+};
diff --git a/renderer/src/layouts/editor/SectionContainer.js b/renderer/src/layouts/editor/SectionContainer.js
index 5b2208cb6..72e5d0bb7 100644
--- a/renderer/src/layouts/editor/SectionContainer.js
+++ b/renderer/src/layouts/editor/SectionContainer.js
@@ -1,14 +1,12 @@
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect } from 'react';
import dynamic from 'next/dynamic';
import localforage from 'localforage';
import ObsEditor from '@/components/EditorPage/ObsEditor/ObsEditor';
import AudioEditor from '@/components/EditorPage/AudioEditor/AudioEditor';
-import { ScribexContext } from '@/components/context/ScribexContext';
-import { useReadUsfmFile } from '@/components/hooks/scribex/useReadUsfmFile';
import packageInfo from '../../../../package.json';
import SectionPlaceholder1 from './SectionPlaceholder1';
import SectionPlaceholder2 from './SectionPlaceholder2';
-import Scribex from '@/components/EditorPage/Scribex/Scribex'; // eslint-disable-line
+import TextEditor from '@/components/EditorPage/TextEditor'; // eslint-disable-line
const MainPlayer = dynamic(
() => import('@/components/EditorPage/AudioEditor/MainPlayer'),
@@ -32,20 +30,12 @@ const SectionContainer = () => {
});
}, [editor]);
- const { usfmData, bookAvailable } = useReadUsfmFile();
- const { state, actions } = useContext(ScribexContext);
- const props = {
- usfmData,
- bookAvailable,
- state,
- actions,
- };
return (
<>
- {(editor === 'textTranslation' &&
)
+ {(editor === 'textTranslation' &&
)
|| (editor === 'textStories' &&
)
|| (editor === 'audioTranslation' &&
)}
diff --git a/renderer/src/layouts/editor/WebSectionContainer.js b/renderer/src/layouts/editor/WebSectionContainer.js
index 438b89738..14642663e 100644
--- a/renderer/src/layouts/editor/WebSectionContainer.js
+++ b/renderer/src/layouts/editor/WebSectionContainer.js
@@ -5,16 +5,10 @@ import dynamic from 'next/dynamic';
import localforage from 'localforage';
import ObsEditor from '@/components/EditorPage/ObsEditor/ObsEditor';
import AudioEditor from '@/components/EditorPage/AudioEditor/AudioEditor';
-import { ScribexContext } from '@/components/context/ScribexContext';
-import { useReadUsfmFile } from '@/components/hooks/scribex/useReadUsfmFile';
-import Scribex from '@/components/EditorPage/Scribex/Scribex'; // eslint-disable-line
+import TextEditor from '@/components/EditorPage/TextEditor'; // eslint-disable-line
import SectionPlaceholder1 from './WebSectionPlaceholder1';
import SectionPlaceholder2 from './WebSectionPlaceholder2';
import { newPath, sbStorageDownload } from '../../../../supabase';
-// if (!process.env.NEXT_PUBLIC_IS_ELECTRON) {
-// const supabaseStorage = require('../../../../../supabase').supabaseStorage
-// const newPath = require('../../../../supabase').newPath
-// }
const MainPlayer = dynamic(
() => import('@/components/EditorPage/AudioEditor/MainPlayer'),
@@ -36,21 +30,12 @@ const SectionContainer = () => {
setSupabaseEditor();
}, [editor]);
- const { usfmData, bookAvailable } = useReadUsfmFile();
- const { state, actions } = useContext(ScribexContext);
- const props = {
- usfmData,
- bookAvailable,
- state,
- actions,
- };
-
return (
<>
- {(editor === 'textTranslation' &&
)
+ {(editor === 'textTranslation' &&
)
|| (editor === 'textStories' &&
)
|| (editor === 'audioTranslation' &&
)}
diff --git a/renderer/src/modules/projects/CustomList.js b/renderer/src/modules/projects/CustomList.js
index a08a9c798..d51086530 100644
--- a/renderer/src/modules/projects/CustomList.js
+++ b/renderer/src/modules/projects/CustomList.js
@@ -10,7 +10,7 @@ export default function CustomList({
const dropdownWidth = width ?? 40;
return (
-
+
{selected?.title}
@@ -26,7 +26,7 @@ export default function CustomList({
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
-
+
{options.map((option) => (
${verseNumber}`;
+// paste copied text from external source. This will paste the sanitized text.
+export function pasteTextAtCursorPosition({ cursorPosition, textToInsert }) {
+ setCurrentCursorPosition(cursorPosition);
+ const sel = window.getSelection();
+ let range;
+ if (sel.getRangeAt && sel.rangeCount) {
+ range = sel.getRangeAt(0);
+ range.deleteContents();
+ range.insertNode(document.createTextNode(textToInsert));
+ sel.collapseToEnd();
+ }
+}
+
+export function insertVerseNumber({ caretPosition, numberToInsert }) {
+ console.log({ caretPosition, numberToInsert });
+ if (numberToInsert && caretPosition) {
+ const verseTag = `${numberToInsert}`;
pasteHtmlAtCaret(verseTag, false, caretPosition);
}
}
-export function insertChapterNumber(caretPosition, chapterNumber) {
- if (chapterNumber && caretPosition) {
- const chapterTag = `"${chapterNumber}"`;
+export function insertChapterNumber({ caretPosition, numberToInsert }) {
+ console.log({ caretPosition, numberToInsert });
+ if (numberToInsert && caretPosition) {
+ const chapterTag = `${numberToInsert}`;
pasteHtmlAtCaret(chapterTag, false, caretPosition);
}
}
-export function insertFootnote(caretPosition, footNote, selectedText) {
- if (footNote && caretPosition) {
- const footnoteTag = ``;
- const footnoteTagWithSelection = ``;
+export function insertFootnote({ caretPosition, textToInsert, selectedText }) {
+ if (textToInsert && caretPosition) {
+ const footnoteTag = ``;
+ const footnoteTagWithSelection = ``;
selectedText && selectedText.length !== 0 ? pasteHtmlAtCaret(footnoteTagWithSelection, false, caretPosition) : pasteHtmlAtCaret(footnoteTag, false, caretPosition);
}
}
-export function insertXRef(caretPosition, references, selectedText) {
- if (insertXRef && caretPosition) {
- const xRefTag = `+${references}`;
- const xRefTagWithSelection = `+${selectedText}${references}`;
+export function insertXRef({ caretPosition, textToInsert, selectedText }) {
+ if (textToInsert && caretPosition) {
+ const xRefTag = `+${textToInsert}`;
+ const xRefTagWithSelection = `+${selectedText} ${textToInsert}`;
selectedText && selectedText.length !== 0
? pasteHtmlAtCaret(xRefTagWithSelection, false, caretPosition)
: pasteHtmlAtCaret(xRefTag, false, caretPosition);
}
}
+// export function insertHeading(caretPosition, heading) {
+// // if (heading && caretPosition) {
+// const headingTag = `${'test heading'}`;
+// // const headingTag = `${'subheading'}`;
+// console.log('inserting section heading');
+// pasteHtmlAtCaret(headingTag, false, caretPosition);
+// // }
+// }
// Helper function to get selected text within the editor
export function getSelectedText() {
@@ -165,61 +188,3 @@ export function getSelectedText() {
}
return selectedText;
}
-
-// Paste text from clipboard
-export function pasteText() {
- const editor = document.getElementById('editor');
-
- navigator.clipboard.readText()
- .then((text) => {
- editor.focus();
- document.execCommand('insertText', false, text);
- })
- .catch((error) => {
- console.error(`Unable to paste text: ${error}`);
- });
-}
-export class Clipboard {
- static copyText(text) {
- navigator.clipboard
- .writeText(text)
- .then(() => {
- // console.log('Text copied to clipboard');
- })
- .catch((error) => {
- console.error('Failed to copy text:', error);
- });
- }
-
- static pasteText(element) {
- navigator.clipboard
- .readText()
- .then((pastedText) => {
- element.focus();
- document.execCommand('insertText', false, pastedText);
- // console.log('Text pasted from clipboard');
- })
- .catch((error) => {
- console.error('Failed to paste text:', error);
- });
- }
-}
-
-// export function getWordAtCursor(parentElement) {
-// const cursorPosition = Cursor.getCurrentCursorPosition(parentElement);
-// const textContent = parentElement.textContent;
-// const words = textContent.trim().split(/\s+/);
-// let charCount = 0;
-
-// for (let i = 0; i < words.length; i++) {
-// const word = words[i];
-// const wordLength = word.length;
-// charCount += wordLength + 1; // +1 for the space after the word
-
-// if (charCount > cursorPosition) {
-// return word;
-// }
-// }
-
-// return null;
-// }
diff --git a/styles/globals.css b/styles/globals.css
index 83d9cdb90..c544797b6 100644
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -261,3 +261,6 @@ p.paragraph:has(.chapter) {
.perf .PerfEditorWrapper {
margin: 0.1em;
} */
+.button {
+ @apply flex h-8 cursor-pointer items-center justify-center rounded-lg p-2 text-xs font-bold outline-none xl:px-4;
+}
\ No newline at end of file
diff --git a/supabase.js b/supabase.js
index 181f6b234..6a2a87768 100644
--- a/supabase.js
+++ b/supabase.js
@@ -97,7 +97,10 @@ const sbStorageDownload = async (path) => {
const sbStorageUpdate = async ({ path, payload, options = {} }) => {
await supabaseStorage().update(path, payload, options);
};
-const sbStorageRemove = async (path, payload, options) => {
+const sbStorageRemove = async (path, options) => {
+ if (options) {
+ await supabaseStorage().remove(path, options);
+ }
await supabaseStorage().remove(path);
};
diff --git a/yarn.lock b/yarn.lock
index 8a64f5a80..5547576c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8485,18 +8485,7 @@ epitelete-html@0.2.20-beta.2:
node-html-parser "^5.3.3"
pure-uuid "^1.6.3"
-epitelete@0.2.20-beta.1:
- version "0.2.20-beta.1"
- resolved "https://registry.yarnpkg.com/epitelete/-/epitelete-0.2.20-beta.1.tgz#e604ef358132dcb265ce3a967a6aec58162e1b13"
- integrity sha512-sJpjnj01UDTtO7glo6Tmyvl5WJCZSSyFzbbMWugXM7+LCDdZdIfzdvOWOL+4H68G4ZUjZF3VcA9/PsnE/sBgzA==
- dependencies:
- "@babel/core" "^7.19.0"
- base-64 "^1.0.0"
- proskomma-json-tools "^0.6.6"
- pure-uuid "^1.6.3"
- rfdc "^1.3.0"
-
-epitelete@^0.2.20-beta.1:
+epitelete@^0.2.20, epitelete@^0.2.20-beta.1:
version "0.2.20"
resolved "https://registry.yarnpkg.com/epitelete/-/epitelete-0.2.20.tgz#1a89703d5e3152461179bd87540a6f58905141cc"
integrity sha512-dag7scneBXNrR4LLSmeFWxb1ShYeWOxxRqyogJo9UEES2Nr8B5cNDfGqMqYOszCAMdmnGH1RoH1qydAk04JjoA==
@@ -16169,16 +16158,6 @@ proskomma-json-tools@^0.5.7:
ajv "^8.11.0"
deep-equal "^2.0.5"
-proskomma-json-tools@^0.6.6:
- version "0.6.6"
- resolved "https://registry.yarnpkg.com/proskomma-json-tools/-/proskomma-json-tools-0.6.6.tgz#a5df84641ff4c6239f94ab93e3dbf71e52333d88"
- integrity sha512-IEBJTyg6YDKr4E54CLDO1wDjcoiqGKjLxRDTnNSDRaHBG1TJyN1k94V6CHVrvgzKUtQFdWRH77mQ6hJjIUSLVg==
- dependencies:
- "@babel/core" "^7.17.10"
- "@babel/plugin-proposal-throw-expressions" "^7.18.6"
- ajv "^8.11.0"
- deep-equal "^2.0.5"
-
proskomma-json-tools@^0.7.1:
version "0.7.2"
resolved "https://registry.yarnpkg.com/proskomma-json-tools/-/proskomma-json-tools-0.7.2.tgz#317a0be61402811c5a5cea6fbef2468003e242d5"