@dvrd/dvr-controls 1.1.31 → 1.1.33

package/index.ts

@@ -59,7 +59,6 @@ import FileUpload from './src/js/fileUpload/fileUpload';
 import DvrdRadioController from './src/js/radio/dvrdRadioController';
 import MobileNavigation from './src/js/navigation/mobileNavigation';
 import NumberString from './src/js/util/numberString';
-import { DialogActionShape } from './src/js/util/interfaces';
 
 export {
     // Components
@@ -113,7 +112,6 @@ export {
     MobileNavigation,
 
     // Interfaces / Enums
-    DialogActionShape,
     LabelType,
     BreakType,
     HeaderItem,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [
@@ -12,6 +12,10 @@
   },
   "author": "Dave van Rijn",
   "license": "ISC",
+  "scripts": {
+    "build": "yarn typecheck && npm publish",
+    "typecheck": "tsc --noEmit"
+  },
   "browserslist": {
     "production": [
       ">0.2%",

package/src/js/pdf/element/pdfElement.tsx

@@ -6,7 +6,7 @@ import './style/pdfElement.scss';
 import React, {MouseEventHandler, PropsWithChildren, PureComponent} from 'react';
 import {DraggableData, HandleClasses, HandleStyles, ResizeEnable, Rnd} from 'react-rnd';
 import {
-    CustomAppEvent, ElementPosition, IndexedObject, PDFElementDimensions, PDFElementParams, PDFElementPersist, PdfFont,
+    CustomAppEvent, ElementPosition, PDFElementDimensions, PDFElementParams, PDFElementPersist, PdfFont,
     RNDDimensions
 } from "../../util/interfaces";
 import {generateComponentId} from "../../util/componentUtil";
@@ -17,7 +17,7 @@ import NumberString from "../../util/numberString";
 
 interface State {
     dragging: boolean;
-    settings: IndexedObject<any>;
+    settings: Record<string, any>;
 }
 
 interface SharedProps {

package/src/js/pdf/image/pdfImage.tsx

@@ -5,7 +5,7 @@ import './style/pdfImage.scss';
 
 import React, {MouseEventHandler} from 'react';
 import {
-    ElementPosition, IndexedObject, PDFDisplay, PDFElementParams, PDFElementPersist, PDFElementType, PDFImageParams
+    ElementPosition, PDFDisplay, PDFElementParams, PDFElementPersist, PDFElementType, PDFImageParams
 } from "../../util/interfaces";
 import {PDFDraggable, PdfElement} from "../element/pdfElement";
 import {nullify} from "../../util/miscUtil";
@@ -14,7 +14,7 @@ import {AwesomeIcon, directTimeout, PAGE_HEIGHT, PAGE_WIDTH} from "../../../../i
 interface Props {
     onDelete: MouseEventHandler;
     onSaveHistory: VoidFunction;
-    values: IndexedObject<string>;
+    values: Record<string, string>;
     defaultSettings?: Partial<PDFImageParams>;
     id?: string;
     defaultPosition: { x: number; y: number };

package/src/js/pdf/pdfTemplateCreator.tsx

@@ -11,7 +11,6 @@ import {
     dispatchCustomEvent,
     DvrdButton,
     generateUUID,
-    IndexedObject,
     PDFElementParams,
     PDFElementPersist,
     PDFElementType,
@@ -37,7 +36,7 @@ interface Props {
     onPreview?: PDFSubmitHandler;
     onSubmit: PDFSubmitHandler;
     onChangeFont: (font: PdfFont, callback?: VoidFunction) => void;
-    values: IndexedObject<string>;
+    values: Record<string, string>;
     defaultItems?: DefaultPDFElementParams<any, any>[];
     resetItems: DefaultPDFElementParams<any, any>[];
     customVariables?: PDFTextVariables;
@@ -53,7 +52,7 @@ interface Props {
 }
 
 interface State {
-    elements: IndexedObject<{ element: React.ReactElement, config: DefaultPDFElementParams<any, any> }>;
+    elements: Record<string, { element: React.ReactElement, config: DefaultPDFElementParams<any, any> }>;
     focusedElement: PdfElement | null;
     canUndo: boolean;
     canRedo: boolean;
@@ -66,12 +65,12 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
         supportMultiPage: false,
         singleImage: false,
     };
-    private refObjects: IndexedObject<PdfElement>;
+    private refObjects: Record<string, PdfElement>;
 
     constructor(props: Props) {
         super(props);
         this.refObjects = {};
-        const elements: IndexedObject<{
+        const elements: Record<string, {
             element: React.ReactElement,
             config: DefaultPDFElementParams<any, any>
         }> = this.processItems(props.defaultItems);
@@ -79,7 +78,7 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
     }
 
     reloadTemplate(items: DefaultPDFElementParams<any, any>[]) {
-        const elements: IndexedObject<{
+        const elements: Record<string, {
             element: React.ReactElement,
             config: DefaultPDFElementParams<any, any>
         }> = this.processItems(items);
@@ -87,11 +86,11 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
     }
 
     processItems = (items?: DefaultPDFElementParams<any, any>[],
-                    convertUnits: boolean = true): IndexedObject<{
+                    convertUnits: boolean = true): Record<string, {
         element: React.ReactElement,
         config: DefaultPDFElementParams<any, any>
     }> => {
-        const elements: IndexedObject<{ element: React.ReactElement, config: DefaultPDFElementParams<any, any> }> = {};
+        const elements: Record<string, { element: React.ReactElement, config: DefaultPDFElementParams<any, any> }> = {};
         if (items?.length) {
             items = JSON.parse(JSON.stringify(items));
             if (items) {

package/src/js/pdf/settings/text/pdfTextSettings.tsx

@@ -6,13 +6,7 @@ import './style/pdfTextSettings.scss';
 import React, {PureComponent} from 'react';
 import PdfText from "../../text/pdfText";
 import {
-    ElementPosition,
-    IndexedObject,
-    PDFDisplay,
-    PdfFont,
-    PDFTextParams,
-    PDFTextVariables,
-    SelectItemShape
+    ElementPosition, PDFDisplay, PdfFont, PDFTextParams, PDFTextVariables, SelectItemShape
 } from "../../../util/interfaces";
 import {ColorPicker, DVRDNumberInput, DvrdSelect, fontItems, getPdfVariables} from "../../../../../index";
 import classNames from 'classnames';
@@ -24,7 +18,7 @@ interface Props {
     supportMultiPage: boolean;
 }
 
-interface State extends IndexedObject<any> {
+interface State extends Record<string, any> {
     openVariables: keyof PDFTextVariables;
     bold: boolean;
     underline: boolean;
@@ -134,7 +128,7 @@ export default class PdfTextSettings extends PureComponent<Props, State> {
         )
     };
 
-    renderVariables = (type: keyof PDFTextVariables, title: string, variables: IndexedObject<string>) => (
+    renderVariables = (type: keyof PDFTextVariables, title: string, variables: Record<string, string>) => (
         <div className={classNames('variables-container', this.state.openVariables === type && 'open')}>
             <label className='variables-title' onClick={this.onClickVariablesTitle(type)}>{title}</label>
             <div className='variables-main-container'>

package/src/js/pdf/text/pdfText.tsx

@@ -6,7 +6,6 @@ import './style/pdfText.scss';
 import React, {CSSProperties, MouseEventHandler} from 'react';
 import {
     CustomAppEvent,
-    IndexedObject,
     PDFDisplay,
     PDFElementParams,
     PDFElementPersist,
@@ -25,7 +24,7 @@ import {remToPx, WithEvents} from "../../../../";
 interface Props {
     onDelete: MouseEventHandler;
     onSaveHistory: VoidFunction;
-    values: IndexedObject<string>;
+    values: Record<string, string>;
     defaultSettings?: Partial<PDFTextParams>;
     id?: string;
     customVariables?: PDFTextVariables;

package/src/js/util/interfaces.ts

@@ -36,10 +36,6 @@ export interface PasswordRule {
     validator: (password: string) => boolean;
 }
 
-export interface IndexedObject<T> {
-    [key: string]: T;
-}
-
 export interface ColorSet {
     base: string;
     contrast: string;
@@ -51,7 +47,7 @@ export interface OrnamentShape {
     allowPropagation?: boolean;
 }
 
-export interface ResponseData extends IndexedObject<any> {
+export interface ResponseData extends Record<string, any> {
     status: string;
     message?: string;
     success?: boolean;
@@ -197,7 +193,7 @@ export type ModelResponse<T> = (obj: T, success: boolean | undefined, data: Resp
 export type StrengthGauge = {validator: (password: string) => boolean};
 export type PDFSetting = {key: string; label: string; type: PDFSettingType; value: any};
 
-export type PDFElementParams<T extends PDFElementType, O extends IndexedObject<any>> = {
+export type PDFElementParams<T extends PDFElementType, O extends Record<string, any>> = {
     key: string;
     type: T;
     sub_type?: PDFElementSubType | null;
@@ -206,7 +202,7 @@ export type PDFElementParams<T extends PDFElementType, O extends IndexedObject<a
     persistent?: PDFElementPersist;
     linkedID?: string;
 }
-export type DefaultPDFElementParams<T extends PDFElementType, O extends IndexedObject<any>> = Partial<{
+export type DefaultPDFElementParams<T extends PDFElementType, O extends Record<string, any>> = Partial<{
     type: T;
     dimensions: Partial<{left: number; top: number; width: number; height: number}>;
     options: O;
@@ -246,9 +242,9 @@ export type PDFInvoiceTableParams = {
 };
 export type PDFInvoiceWidths = {name: number; price: number; quantity: number; subtotal: number}
 export type PDFTextVariables = {
-    company: IndexedObject<string>;
-    client: IndexedObject<string>;
-    invoice: IndexedObject<string>;
+    company: Record<string, string>;
+    client: Record<string, string>;
+    invoice: Record<string, string>;
 }
 export type PDFSubmitHandler = (items: PDFElementParams<any, any>[], callback?: VoidFunction) => void;
 export type PDFElementDimensions = {left: number; top: number; width: number; height: number};

package/src/js/util/miscUtil.ts

@@ -4,13 +4,12 @@
 
 import DOMPurify from 'dompurify';
 import React from 'react';
-import {IndexedObject} from './interfaces';
 
 declare global {
     // noinspection JSUnusedGlobalSymbols
     interface Window {
         log: Function;
-        settings: IndexedObject<any>;
+        settings: Record<string, any>;
         allowCookies: boolean;
         gtag?: Function;
         gapi?: any;
@@ -18,7 +17,7 @@ declare global {
 }
 
 export const getSetting = (name: string): any => {
-    const settings: IndexedObject<any> = window.settings;
+    const settings: Record<string, any> = window.settings;
     if (settings.hasOwnProperty(name))
         return settings[name];
     console.warn(`Global settings does not contain a value for '${name}'`);

package/src/js/util/pdfUtil.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2024. Dave van Rijn Development
  */
 
-import {DefaultPDFElementParams, IndexedObject, PdfFont, PDFTextVariables, SelectItemShape} from "./interfaces";
+import {DefaultPDFElementParams, PdfFont, PDFTextVariables, SelectItemShape} from "./interfaces";
 
 export const mmToPt = (mm: number) => Math.round(pxToPt(mmToPx(mm)));
 export const mmToPx = (mm: number, toTens: boolean = true) => {
@@ -70,7 +70,7 @@ export const getPdfVariables = (customVariables?: PDFTextVariables): PDFTextVari
     return variables;
 }
 
-export const setPdfVariables = (text: string, values: IndexedObject<string>) => {
+export const setPdfVariables = (text: string, values: Record<string, string>) => {
     for (const key of Object.keys(values)) {
         const value = values[key];
         if (text.includes(`{${key}}`) && value.length) text =