jodit-react 5.0.0-beta.1 → 5.0.0-beta.3

package/build/types/JoditEditor.d.ts

@@ -1,13 +1,14 @@
 import React from 'react';
 import type { IJodit } from 'jodit/types/types/jodit';
 import type { Jodit as JoditConstructorType } from 'jodit';
+import type { Config } from 'jodit/config';
 import { Jodit } from './include.jodit';
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
 interface Props<T extends typeof JoditConstructorType = typeof Jodit> {
     JoditConstructor?: T;
-    config?: DeepPartial<ReturnType<T['make']>['options']>;
+    config?: DeepPartial<Config>;
     className?: string;
     id?: string;
     name?: string;

package/examples/components/Form.tsx

@@ -30,6 +30,7 @@ const Form = () => {
 	const [isSource, setSource] = useState(false);
 
 	const [config, setConfig] = useState({
+		toolbarAdaptive: false,
 		readonly: false,
 		toolbar: true
 	});

package/index.d.ts

@@ -1 +1,4 @@
-export type * from './build/types/index.d.ts';
+import JoditEditor from './build/types/JoditEditor';
+import { Jodit } from './build/types/include.jodit';
+export default JoditEditor;
+export { Jodit };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit-react",
-	"version": "5.0.0-beta.1",
+	"version": "5.0.0-beta.3",
 	"description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
 	"main": "build/jodit-react.js",
 	"author": "Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)",
@@ -19,8 +19,8 @@
 		"jodit": "^4.2.47"
 	},
 	"peerDependencies": {
-		"react": "~0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-		"react-dom": "~0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+		"react": "~0.14 || ^15 || ^16 || ^17 || ^18 || ^19",
+		"react-dom": "~0.14 || ^15 || ^16 || ^17 || ^18 || ^19"
 	},
 	"devDependencies": {
 		"@eslint/compat": "^1.2.4",
@@ -40,6 +40,7 @@
 		"react-dom": "^18.3.1",
 		"style-loader": "^4.0.0",
 		"swc-loader": "^0.2.6",
+		"typescript": "^5.7.2",
 		"webpack": "^5.97.1",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^5.1.0"

package/src/JoditEditor.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, forwardRef, useLayoutEffect } from 'react';
 import type { IJodit } from 'jodit/types/types/jodit';
 import type { Jodit as JoditConstructorType } from 'jodit';
+import type { Config } from 'jodit/config';
 import { Jodit } from './include.jodit';
 
 function usePrevious(value: string): string {
@@ -19,7 +20,7 @@ type DeepPartial<T> = T extends object
 
 interface Props<T extends typeof JoditConstructorType = typeof Jodit> {
 	JoditConstructor?: T;
-	config?: DeepPartial<ReturnType<T['make']>['options']>;
+	config?: DeepPartial<Config>;
 	className?: string;
 	id?: string;
 	name?: string;
@@ -84,11 +85,17 @@ const JoditEditor = forwardRef<IJodit, Props>(
 				preClassName !== className &&
 				typeof preClassName === 'string'
 			) {
-				preClassName.split(/\s+/).forEach(cl => classList?.remove(cl));
+				preClassName
+					.split(/\s+/)
+					.filter(Boolean)
+					.forEach(cl => classList?.remove(cl));
 			}
 
 			if (className && typeof className === 'string') {
-				className.split(/\s+/).forEach(cl => classList?.add(cl));
+				className
+					.split(/\s+/)
+					.filter(Boolean)
+					.forEach(cl => classList?.add(cl));
 			}
 		}, [className, preClassName]);
 

package/.github/ISSUE_TEMPLATE.md

@@ -1,18 +0,0 @@
-<!-- BUGS: Please use this template -->
-<!-- QUESTIONS: This is not a general support forum! Ask Qs at http://stackoverflow.com/questions/tagged/jodit -->
-
-**Jodit Version:**  3.4.xxxxx
-
-**Browser:**  <!-- Chrome/IE/Safary/FF -->
-**OS:**  <!-- Windows/Mac/Linux -->
-**Is React App:**  <!-- True/False -->
-
-**Code**
-
-```js
-// A *self-contained* demonstration of the problem follows...
-```
-
-**Expected behavior:**
-
-**Actual behavior:**

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +0,0 @@
-<!--
-
-Thank you for submitting a pull request!
-
-Here's a checklist you might find useful.
-[ ] There is an associated issue that is labelled
-  'Bug' or 'help wanted' or is in the Community milestone
-[ ] Code is up-to-date with the `main` branch
-[ ] You've successfully run `npm test` locally
-[ ] There are new or updated tests validating the change
-
--->
-
-Fixes #

package/.github/workflows/new-version.yml

@@ -1,42 +0,0 @@
-name: New version
-
-on:
-  workflow_dispatch:
-
-  repository_dispatch:
-    types: [newversion]
-
-jobs:
-  newversion:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
-          fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
-      - uses: actions/setup-node@v4 #Setup Node
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-      - name: Create local changes
-        run: |
-          npm ci
-          npm i jodit
-
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-
-          npm version patch --no-git-tag-version
-          npm run git
-
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
-          tags: true
-
-      - name: Trigger release action
-        run: |
-          curl -XPOST -u "${{ secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept:application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/jodit/jodit-react/dispatches --data '{"event_type": "release" }'
-

package/.github/workflows/release.yml

@@ -1,36 +0,0 @@
-name: Publish Package to npmjs
-
-on:
-  repository_dispatch:
-    types: [ release ]
-
-  push:
-    tags: ["*"]
-
-jobs:
-  release:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4 #Setup Node
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'npm'
-
-    - name: Install dependencies
-      run: |
-        npm ci
-
-    - name: Lint
-      run: |
-        npm run lint
-
-    - name: Build
-      run: |
-        npm run build
-
-    - name: Publish
-      run: |
-        NPM_TOKEN=${{ secrets.NPM_TOKEN }} npm publish ./ --access public --tag beta

package/examples/webpack.config.ts

@@ -1,43 +0,0 @@
-import path from 'node:path';
-import process from 'node:process';
-
-export default {
-	entry: './app.tsx',
-	context: path.join(process.cwd(), './examples/'),
-	devtool: 'eval',
-	module: {
-		rules: [
-			{
-				test: /\.(js|jsx|ts|tsx)$/,
-				use: {
-					loader: 'swc-loader'
-				}
-			},
-			{
-				test: /\.css$/,
-				use: ['style-loader', 'css-loader']
-			}
-		]
-	},
-
-	resolve: {
-		extensions: ['.js', '.jsx', '.ts', '.tsx']
-	},
-
-	output: {
-		path: path.join(process.cwd(), './examples/build/'),
-		filename: 'app.js'
-	},
-
-	devServer: {
-		static: './examples',
-		open: true,
-		allowedHosts: 'all',
-		client: {
-			progress: true,
-			overlay: true
-		},
-		port: 4000,
-		hot: true
-	}
-};

package/webpack.config.ts

@@ -1,71 +0,0 @@
-import path from 'path';
-import webpack from 'webpack';
-import process from 'process';
-
-export default (env: unknown, argv: { mode?: string }, dir = process.cwd()) => {
-	const debug = !argv || !argv.mode || !argv.mode.match(/production/);
-
-	return {
-		context: dir,
-
-		entry: './src/index.ts',
-		devtool: debug ? 'inline-source-map' : false,
-
-		module: {
-			rules: [
-				{
-					test: /\.(js|jsx|ts|tsx)$/,
-					use: {
-						loader: 'swc-loader'
-					}
-				},
-				{
-					test: /\.css$/,
-					use: ['style-loader', 'css-loader']
-				}
-			]
-		},
-
-		resolve: {
-			extensions: ['.ts', '.tsx', '.js', '.jsx'],
-			alias: {
-				'jodit-react': path.join(__dirname, './src')
-			}
-		},
-
-		output: {
-			path: path.join(dir, './build/'),
-			filename: 'jodit-react.js',
-			library: ['JoditEditor', 'Jodit'],
-			libraryTarget: 'umd'
-		},
-
-		plugins: [
-			new webpack.DefinePlugin({
-				'process.env': {
-					NODE_ENV: JSON.stringify(
-						debug ? 'development' : 'production'
-					)
-				}
-			}),
-			new webpack.optimize.ModuleConcatenationPlugin()
-		],
-
-		externals: {
-			jodit: 'jodit',
-			Jodit: 'Jodit',
-			react: {
-				root: 'React',
-				commonjs2: 'react',
-				commonjs: 'react',
-				amd: 'react'
-			},
-			'react-dom': {
-				root: 'ReactDOM',
-				commonjs2: 'react-dom',
-				commonjs: 'react-dom',
-				amd: 'react-dom'
-			}
-		}
-	};
-};