Skip to content

Commit

Permalink
Merge pull request #821 from DNNCommunity/release/0.21.0
Browse files Browse the repository at this point in the history
Updated `develop` with latest fixes from v0.21.0
  • Loading branch information
valadas authored Sep 14, 2023
2 parents 479355b + 682c198 commit 8a405ef
Show file tree
Hide file tree
Showing 7 changed files with 141 additions and 34 deletions.
118 changes: 109 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions packages/stencil-library/custom-elements.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"type": {
"text": "\"danger\" | \"primary\" | \"secondary\" | \"tertiary\""
},
"description": "Optional button style,\r\ncan be either primary, secondary or tertiary or danger and defaults to primary if not specified",
"description": "Optional button style,\ncan be either primary, secondary or tertiary or danger and defaults to primary if not specified",
"default": "'primary'",
"required": false
}
Expand Down Expand Up @@ -378,7 +378,7 @@
"type": {
"text": "boolean"
},
"description": "If true, will allow the user to take a snapshot\r\nusing the device camera. (only works over https).",
"description": "If true, will allow the user to take a snapshot\nusing the device camera. (only works over https).",
"default": "false",
"required": false
},
Expand All @@ -387,7 +387,7 @@
"type": {
"text": "number"
},
"description": "Specifies the jpeg quality for when the device\r\ncamera is used to generate a picture.\r\nNeeds to be a number between 0 and 1 and defaults to 0.8",
"description": "Specifies the jpeg quality for when the device\ncamera is used to generate a picture.\nNeeds to be a number between 0 and 1 and defaults to 0.8",
"default": "0.8",
"required": false
},
Expand All @@ -407,7 +407,7 @@
"type": {
"text": "string[]"
},
"description": "A list of allowed file extensions.\r\nIf not specified, any file is allowed.\r\nEx: [\"jpg\", \"jped\", \"gif\", \"png\"]",
"description": "A list of allowed file extensions.\nIf not specified, any file is allowed.\nEx: [\"jpg\", \"jped\", \"gif\", \"png\"]",
"required": false
},
{
Expand Down Expand Up @@ -456,7 +456,7 @@
"kind": "class",
"name": "dnn-image-cropper.tsx",
"tagName": "dnn-image-cropper",
"description": "Allows cropping an image in-browser with the option to enforce a specific final size.\r\nAll computation happens in the browser and the final image is emmited\r\nin an event that has a data-url of the image.",
"description": "Allows cropping an image in-browser with the option to enforce a specific final size.\nAll computation happens in the browser and the final image is emmited\nin an event that has a data-url of the image.",
"attributes": [
{
"name": "height",
Expand Down Expand Up @@ -500,8 +500,8 @@
"type": {
"text": "{ capture: string; dragAndDropFile: string; or: string; takePicture: string; uploadFile: string; imageTooSmall: string; modalCloseText: string; }"
},
"description": "Can be used to customize controls text.\r\nSome values support tokens, see default values for examples.",
"default": "{\r\n capture: \"Capture\",\r\n dragAndDropFile: \"Drag and drop an image\",\r\n or: \"or\",\r\n takePicture: \"Take a picture\",\r\n uploadFile: \"Upload an image\",\r\n imageTooSmall: \"The image you are attempting to upload does not meet the minimum size requirement of {width} pixels by {height} pixels. Please upload a larger image.\",\r\n modalCloseText: \"Close\",\r\n }",
"description": "Can be used to customize controls text.\nSome values support tokens, see default values for examples.",
"default": "{\n capture: \"Capture\",\n dragAndDropFile: \"Drag and drop an image\",\n or: \"or\",\n takePicture: \"Take a picture\",\n uploadFile: \"Upload an image\",\n imageTooSmall: \"The image you are attempting to upload does not meet the minimum size requirement of {width} pixels by {height} pixels. Please upload a larger image.\",\n modalCloseText: \"Close\",\n }",
"required": false
},
{
Expand Down Expand Up @@ -777,7 +777,7 @@
"type": {
"text": "string"
},
"description": "Optionally pass the aria-label text for the close button.\r\nDefaults to \"Close modal\" if not provided.",
"description": "Optionally pass the aria-label text for the close button.\nDefaults to \"Close modal\" if not provided.",
"default": "\"Close modal\"",
"required": false
},
Expand All @@ -795,7 +795,7 @@
"type": {
"text": "boolean"
},
"description": "Optionally you can pass false to not show the close button.\r\nIf you decide to do so, you should either not also prevent dismissal by clicking the backdrop\r\nor provide your own dismissal logic in the modal content.",
"description": "Optionally you can pass false to not show the close button.\nIf you decide to do so, you should either not also prevent dismissal by clicking the backdrop\nor provide your own dismissal logic in the modal content.",
"default": "true",
"required": false
},
Expand Down Expand Up @@ -933,7 +933,7 @@
"text": "ILocalization"
},
"description": "Optionally allows localizing the component strings.",
"default": "{\r\n Add: \"Add\",\r\n AllRoles: \"All Roles\",\r\n FilterByGroup: \"Filter By Group\",\r\n GlobalRoles: \"Global Roles\",\r\n Role: \"Role\",\r\n RolePermissions: \"Role Permissions\",\r\n SelectRole: \"Select Role\",\r\n User: \"User\",\r\n UserPermissions: \"User Permissions\",\r\n }",
"default": "{\n Add: \"Add\",\n AllRoles: \"All Roles\",\n FilterByGroup: \"Filter By Group\",\n GlobalRoles: \"Global Roles\",\n Role: \"Role\",\n RolePermissions: \"Role Permissions\",\n SelectRole: \"Select Role\",\n User: \"User\",\n UserPermissions: \"User Permissions\",\n }",
"required": false
},
{
Expand Down Expand Up @@ -1152,7 +1152,7 @@
"type": {
"text": "string"
},
"description": "Fires up each time the search query changes.\r\nThe data passed is the new query."
"description": "Fires up each time the search query changes.\nThe data passed is the new query."
}
],
"slots": [],
Expand Down Expand Up @@ -1559,7 +1559,7 @@
"kind": "class",
"name": "dnn-vertical-splitview.tsx",
"tagName": "dnn-vertical-splitview",
"description": "This allows splitting a UI into vertical adjustable panels, the splitter itself is not part of this component.\r\n- The content for the left part should be injected in the `left` slot.\r\n- The content for the right part should be injected in the `right` slot.\r\n- The content for the actual splitter should go in the default slot and other UI elements can be injected as long as you handle their behaviour, by default only the drag behavior is implemented in the component.",
"description": "This allows splitting a UI into vertical adjustable panels, the splitter itself is not part of this component.\n- The content for the left part should be injected in the `left` slot.\n- The content for the right part should be injected in the `right` slot.\n- The content for the actual splitter should go in the default slot and other UI elements can be injected as long as you handle their behaviour, by default only the drag behavior is implemented in the component.",
"attributes": [
{
"name": "split-width-percentage",
Expand Down
5 changes: 4 additions & 1 deletion packages/stencil-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,17 @@
"jest": "^27.0.3",
"jest-cli": "^27.5.1",
"license-checker-rseidelsohn": "^4.2.6",
"jodit": "^3.24.9",
"lit": "^2.7.2",
"npm-run-all": "^4.1.5",
"puppeteer": "^21.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup-plugin-node-polyfills": "^0.2.1",
"storybook": "^7.0.5",
"typescript": "5.0.4",
"typescript-debounce-decorator": "^0.0.18"
},
"dependencies": {
"jodit": "^3.24.9"
}
}
6 changes: 2 additions & 4 deletions packages/stencil-library/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 { Config } from "jodit/types/config";
import { DnnToggleChangeEventDetail } from "./components/dnn-toggle/toggle-interface";
export { ColorInfo } from "./utilities/colorInfo";
export { DropzoneResx } from "./components/dnn-dropzone/types";
Expand All @@ -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 { Config } from "jodit/types/config";
export { DnnToggleChangeEventDetail } from "./components/dnn-toggle/toggle-interface";
export namespace Components {
interface DnnButton {
Expand Down Expand Up @@ -337,7 +335,7 @@ export namespace Components {
/**
* Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html
*/
"options": Config;
"options": typeof Jodit.defaultOptions;
/**
* Sets the value of the content of the editor.
*/
Expand Down Expand Up @@ -1057,7 +1055,7 @@ declare namespace LocalJSX {
/**
* Optional configuration for Jodit, see https://xdsoft.net/jodit/docs/classes/config.Config.html
*/
"options"?: Config;
"options"?: typeof Jodit.defaultOptions;
/**
* Sets the value of the content of the editor.
*/
Expand Down
Loading

0 comments on commit 8a405ef

Please sign in to comment.