Merge pull request #599 from digabi/fix/dir-structure

Fix/dir structure

.gitignore

@@ -34,10 +34,3 @@ dist/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
-
-## Parcel
-.parcel-cache
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/

package.json

@@ -3,8 +3,8 @@
   "version": "8.0.2",
   "description": "Rich text editor",
   "homepage": "https://github.com/digabi/rich-text-editor",
-  "types": "dist/react/index.d.ts",
-  "main": "dist/react/index.js",
+  "types": "dist/app/index.d.ts",
+  "main": "dist/app/index.js",
   "files": [
     "dist/*",
     "server/*"
@@ -27,11 +27,11 @@
     "url": "https://github.com/digabi/rich-text-editor.git"
   },
   "devDependencies": {
-    "@digabi/eslint-config": "^3.2.0",
-    "@playwright/experimental-ct-react": "^1.47.2",
-    "@types/node": "^22.7.4",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
+    "@digabi/eslint-config": "^3.3.0",
+    "@playwright/experimental-ct-react": "^1.48.1",
+    "@types/node": "^22.7.9",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
     "buffer": "^6.0.3",
@@ -42,20 +42,20 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-promise": "^7.1.0",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
     "prettier": "^3.3.3",
     "process": "^0.11.10",
     "sanitize-html": "^2.13.1",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
-    "tslib": "^2.7.0",
-    "typescript": "^5.6.2"
+    "tslib": "^2.8.0",
+    "typescript": "^5.6.3"
   },
   "dependencies": {
     "@digabi/mathquill": "^0.10.12",
-    "@playwright/test": "^1.47.2",
+    "@playwright/test": "^1.48.1",
     "@types/express": "^4.17.21",
-    "@types/jquery": "^3.5.31",
+    "@types/jquery": "^3.5.32",
     "@types/sanitize-html": "^2.13.0",
     "classnames": "^2.5.1",
     "jquery": "^3.7.1",

playwright/editor.spec.tsx

@@ -25,8 +25,8 @@ import {
   selectAll,
   copy,
 } from './test-utils'
-import RichTextEditor from '../src/react'
-import { Answer, nbsp } from '../src/react/utility'
+import RichTextEditor from '../src/app'
+import { Answer, nbsp } from '../src/app/utility'
 import fi from '../src/FI'
 
 test.describe('Rich text editor', () => {

playwright/test-utils.ts

@@ -1,5 +1,5 @@
 import { expect, Page, Locator } from '@playwright/test'
-import { Answer } from '../src/react/utility'
+import { Answer } from '../src/app/utility'
 
 export const assertEditorTextContent = async (editor: Locator, content: string) => {
   expect(await editor.textContent()).toBe(content)

src/react/components/text-area/index.tsx → src/app/components/text-area/index.tsx

@@ -11,7 +11,7 @@ import { sanitize } from '../../utils/sanitization'
 import { isAddMutation, isBr, isRemoveMutation, isTextNode, nbsp } from '../../utility'
 import { useKeyboardEventListener } from '../../hooks/use-keyboard-events'
 import useMutationObserver from '../../hooks/use-mutation-observer'
-import { MATH_EDITOR_CLASS } from '../../../react/utils/create-math-stub'
+import { MATH_EDITOR_CLASS } from '../../utils/create-math-stub'
 
 export type TextAreaProps = {
   ariaInvalid?: boolean

src/react/state/index.tsx → src/app/state/index.tsx

@@ -5,15 +5,14 @@ import useHistory from './history'
 import useMap, { MapHookHandle } from '../hooks/use-map'
 import useMutationObserver from '../hooks/use-mutation-observer'
 
-import { RichTextEditorProps } from '../../react'
-
 import MathEditor, { MathEditorHandle, Props as MathEditorProps } from '../components/math-editor'
 import { createMathStub, MATH_EDITOR_CLASS } from '../utils/create-math-stub'
 
 import FI from '../../FI'
 import SV from '../../SV'
 import { createPortal } from 'react-dom'
 import { getAnswer, nbsp } from '../utility'
+import { RichTextEditorProps } from '../index'
 
 const findWrapperParent = (currentElement: Element): Element | null => {
   if (currentElement?.classList?.contains(MATH_EDITOR_CLASS)) {

src/rich-text-editor.tsx

@@ -1,5 +1,5 @@
 import ReactDOM from 'react-dom/client'
-import RichTextEditor, { RichTextEditorProps } from './react'
+import RichTextEditor, { RichTextEditorProps } from './app'
 
 export type MakeRichTextProps = { container: HTMLElement } & RichTextEditorProps