Merge pull request #805 from valadas/jodit-typeof-config

Use tyeof instead of importing type
DNNCommunity · Aug 21, 2023 · 8a9276a · 8a9276a
2 parents eaf9ae6 + 57d53d0
commit 8a9276a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/packages/stencil-library/custom-elements.json b/packages/stencil-library/custom-elements.json
@@ -1079,7 +1079,7 @@
               "kind": "field",
               "name": "options",
               "type": {
-                "text": "DnnRichtextConfig"
+                "text": "Config"
               },
               "description": "Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html",
               "required": false

diff --git a/packages/stencil-library/package.json b/packages/stencil-library/package.json
@@ -56,7 +56,6 @@
     "gh-pages": "^5.0.0",
     "jest": "^27.0.3",
     "jest-cli": "^27.5.1",
-    "jodit": "^3.24.9",
     "license-checker-rseidelsohn": "^4.2.6",
     "lit": "^2.7.2",
     "npm-run-all": "^4.1.5",

diff --git a/packages/stencil-library/src/components.d.ts b/packages/stencil-library/src/components.d.ts
@@ -12,7 +12,6 @@ import { IRoleGroup } from "./components/dnn-permissions-grid/role-group-interfa
 import { IRole } from "./components/dnn-permissions-grid/role-interface";
 import { ILocalization } from "./components/dnn-permissions-grid/localization-interface";
 import { ISearchedUser } from "./components/dnn-permissions-grid/searched-user-interface";
-import { DnnRichtextConfig } from "./components/dnn-richtext/dnn-richtext-config";
 import { DnnToggleChangeEventDetail } from "./components/dnn-toggle/toggle-interface";
 export { ColorInfo } from "./utilities/colorInfo";
 export { DropzoneResx } from "./components/dnn-dropzone/types";
@@ -21,7 +20,6 @@ export { IRoleGroup } from "./components/dnn-permissions-grid/role-group-interfa
 export { IRole } from "./components/dnn-permissions-grid/role-interface";
 export { ILocalization } from "./components/dnn-permissions-grid/localization-interface";
 export { ISearchedUser } from "./components/dnn-permissions-grid/searched-user-interface";
-export { DnnRichtextConfig } from "./components/dnn-richtext/dnn-richtext-config";
 export { DnnToggleChangeEventDetail } from "./components/dnn-toggle/toggle-interface";
 export namespace Components {
     interface DnnButton {
@@ -337,7 +335,7 @@ export namespace Components {
         /**
           * Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html
          */
-        "options": DnnRichtextConfig;
+        "options": typeof Jodit.defaultOptions;
         /**
           * Sets the value of the content of the editor.
          */
@@ -1057,7 +1055,7 @@ declare namespace LocalJSX {
         /**
           * Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html
          */
-        "options"?: DnnRichtextConfig;
+        "options"?: typeof Jodit.defaultOptions;
         /**
           * Sets the value of the content of the editor.
          */

diff --git a/packages/stencil-library/src/components/dnn-richtext/dnn-richtext-config.ts b/packages/stencil-library/src/components/dnn-richtext/dnn-richtext-config.ts
diff --git a/packages/stencil-library/src/components/dnn-richtext/dnn-richtext.tsx b/packages/stencil-library/src/components/dnn-richtext/dnn-richtext.tsx
@@ -1,6 +1,5 @@
 import { Component, Host, h, Prop, Event, EventEmitter, Watch } from '@stencil/core';
 import { Jodit } from "jodit";
-import { DnnRichtextConfig } from "./dnn-richtext-config";
 import { decodeHtml } from '../../utilities/stringUtilities';
 
 @Component({
@@ -10,10 +9,10 @@ import { decodeHtml } from '../../utilities/stringUtilities';
 })
 export class DnnRichtext {
   /** Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html */
-  @Prop() options: DnnRichtextConfig;
+  @Prop() options: typeof Jodit.defaultOptions;
   private textArea: HTMLTextAreaElement;
   private editor: Jodit;
-  private dnnDefaultOptions: DnnRichtextConfig = {
+  private dnnDefaultOptions: typeof Jodit.defaultOptions = {
     ...Jodit.defaultOptions,
     useSplitMode: true,
   }

diff --git a/packages/stencil-library/src/components/dnn-richtext/readme.md b/packages/stencil-library/src/components/dnn-richtext/readme.md
@@ -7,10 +7,10 @@
 
 ## Properties
 
-| Property  | Attribute | Description                                                                                    | Type                | Default     |
-| --------- | --------- | ---------------------------------------------------------------------------------------------- | ------------------- | ----------- |
-| `options` | --        | Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html | `DnnRichtextConfig` | `undefined` |
-| `value`   | `value`   | Sets the value of the content of the editor.                                                   | `string`            | `undefined` |
+| Property  | Attribute | Description                                                                                    | Type     | Default     |
+| --------- | --------- | ---------------------------------------------------------------------------------------------- | -------- | ----------- |
+| `options` | --        | Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html | `Config` | `undefined` |
+| `value`   | `value`   | Sets the value of the content of the editor.                                                   | `string` | `undefined` |
 
 
 ## Events