@dvrd/dvr-controls 1.1.27 → 1.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [
@@ -10,9 +10,6 @@
     "type": "git",
     "url": "https://bitbucket.org/Naampie/dvr-controls/"
   },
-  "scripts": {
-    "build": "npm publish"
-  },
   "author": "Dave van Rijn",
   "license": "ISC",
   "browserslist": {

package/src/js/pdf/pdfTemplateCreator.tsx

@@ -224,7 +224,7 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
             ref: (ref: any) => {
                 this.refObjects[id] = ref;
             },
-            defaultSettings: {...config.dimensions, ...config.options},
+            defaultSettings: {...config.dimensions, ...config.options, sub_type: config.sub_type},
             key,
         }
         let element = <div/>;

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

@@ -198,6 +198,7 @@ export default class PdfText extends PdfElement<Props, State> {
             type: PDFElementType.TEXT,
             options: {fontSize: fontSize, bold, italic, text, underline, alignment, font, color, persistent, display},
             linkedID: linkedID,
+            sub_type: settings.sub_type,
         };
     }
 

package/src/js/util/cookieUtil.ts

@@ -2,13 +2,13 @@
  * Copyright (c) 2024. Dave van Rijn Development
  */
 
-import Cookies, {CookieAttributes} from "js-cookie";
+import Cookies from "js-cookie";
 
-export const setCookie = (key: string, value: string, args?: CookieAttributes) => {
+export const setCookie = (key: string, value: string, args?: Cookies.CookieAttributes) => {
     Cookies.set(key, value, {...args})
 }
 
-export const removeCookie = (key: string, args?: CookieAttributes) => {
+export const removeCookie = (key: string, args?: Cookies.CookieAttributes) => {
     Cookies.remove(key, args);
 };
 

package/src/js/util/interfaces.ts

@@ -191,6 +191,7 @@ export type DefaultPDFElementParams<T extends PDFElementType, O extends IndexedO
     persistent?: PDFElementPersist;
     key: string;
     linkedID?: string;
+    sub_type?: PDFElementSubType | null;
 }>
 export type PDFImageParams = {
     img: File | string | null;
@@ -210,6 +211,7 @@ export type PDFTextParams = {
     color: string;
     persistent: PDFElementPersist;
     display?: PDFDisplay
+    sub_type?: PDFElementSubType | null;
 };
 export type PDFInvoiceTableParams = {
     fontSize: number;

package/src/js/util/jwtUtil.ts

@@ -2,8 +2,8 @@
  * Copyright (c) 2024. Dave van Rijn Development
  */
 
-import Cookies, {CookieAttributes} from "js-cookie";
-import {debug, getSetting} from "./miscUtil";
+import Cookies from "js-cookie";
+import {getSetting} from "./miscUtil";
 
 let jwtToken: string | null = null;
 
@@ -20,14 +20,14 @@ export const getJwt = (cookieName: string = 'JWT'): string | null => {
 };
 
 export function setJWT(token: string | null, options?: {
-    preserveNull?: boolean; useStorage?: boolean, cookieName?: string; attributes?: CookieAttributes
+    preserveNull?: boolean; useStorage?: boolean, cookieName?: string; attributes?: Cookies.CookieAttributes
 }) {
     jwtToken = token;
     const preserveNull = options?.preserveNull ?? false;
     const useStorage = options?.useStorage ?? true;
     if (window.allowCookies || !token) {
         if (token) {
-            let cookieOptions: CookieAttributes = {expires: 1, sameSite: 'strict', ...options?.attributes};
+            let cookieOptions: Cookies.CookieAttributes = {expires: 1, sameSite: 'strict', ...options?.attributes};
             if (getSetting('mode') !== 'dev') {
                 cookieOptions.secure = true;
                 cookieOptions.sameSite = 'strict';
@@ -40,12 +40,12 @@ export function setJWT(token: string | null, options?: {
 }
 
 export const setJwt = (token: string | null, preserveOnNull: boolean = false, includeStorage: boolean = true,
-                       _options?: CookieAttributes) => {
+                       _options?: Cookies.CookieAttributes) => {
     console.debug('Settings JWT token', {token, preserveOnNull, includeStorage, allowCookies: window.allowCookies});
     jwtToken = token;
     if (window.allowCookies || !token) {
         if (token) {
-            let options: CookieAttributes = {expires: 1, sameSite: 'strict'};
+            let options: Cookies.CookieAttributes = {expires: 1, sameSite: 'strict'};
             if (_options) options = Object.assign({}, options, _options);
             if (getSetting('mode') !== 'dev') {
                 options.secure = true;