amotify 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amotify",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "UI Component for React",
   "main": "dist/launch.js",
   "types": "dist/@types.d.ts",
@@ -34,7 +34,6 @@
     "@fortawesome/free-regular-svg-icons": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "encoding-japanese": "^2.0.0",
     "jsmin-front": "^0.0.17",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -45,7 +44,6 @@
     "@babel/preset-env": "^7.23.3",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@types/encoding-japanese": "^2.0.5",
     "@types/express": "^4.17.21",
     "@types/google.maps": "^3.54.8",
     "@types/react": "^18.2.37",

package/src/@jsminAmotifyExtension/spreadSheet.tsx

@@ -1,8 +1,6 @@
 export { }
 import { publicURI } from '../launch';
 
-import * as EncodingJP from 'encoding-japanese';
-
 declare global {
   var ExcelJS: any;
 }
@@ -13,10 +11,19 @@ declare global {
   D.fn = D.prototype = {} as any
   $.extend( {
     SpreadSheet: function ( workbook: JsminExtension.SpreadSheet.Method,fileName: string ) {
-      this.workbook = workbook;
-      this.fileName = fileName;
+      this.ok = true;
+      try {
+        this.workbook = workbook;
+        this.fileName = fileName;
+      } catch ( error ) {
+        console.log( error );
+        this.ok = false;
+      }
       return this;
     },
+    isValid: function () {
+      return this.ok;
+    },
     getWorkbook: function () {
       return this.workbook;
     },
@@ -90,33 +97,25 @@ declare global {
   let cdn_excelJS = publicURI + '@env/@foreign/exceljs.min.js';
 
   $.spreadSheet = {
-    readFromExcel: async ( file ) => {
+    readFromFile: async ( file ) => {
       if ( !window.ExcelJS ) await amotify.config.readExtraCDN( cdn_excelJS );
       if ( !window.ExcelJS ) return;
-
+      let fileType = file.type;
       let fileName = file.name.replace( /\.[^/.]+$/,'' );
+      if ( fileType.match( /csv/ ) ) {
+        let csv = await file.text();
+        const rows = csv.split( /[\n\r]+/ ).map( row => row.split( /,/ ) );
+
+        const workbook = new ExcelJS.Workbook();
+        const workSheet = workbook.addWorksheet( 'Sheet1' );
+        rows.forEach( row => workSheet.addRow( row ) );
+        return D( workbook,fileName );
+      }
+
       const workbook = new ExcelJS.Workbook();
       const buffer = ( await file.read( 'binaryString' ) as any ).target.result;
       return D( await workbook.xlsx.load( buffer ),fileName );
     },
-    readFromCsv: async ( file ) => {
-      if ( !window.ExcelJS ) await amotify.config.readExtraCDN( cdn_excelJS );
-      if ( !window.ExcelJS ) return;
-
-      let fileName = file.name.replace( /\.[^/.]+$/,'' );
-
-      const buffer = ( await file.read( 'binaryString' ) as any ).target.result;
-      const u8a = new Uint8Array( buffer );
-      const enc: any = EncodingJP.detect( u8a );
-      let csv = ( enc === 'UTF8' && enc === 'ASCII' ) ? await file.text() : EncodingJP.codeToString( EncodingJP.convert( u8a,{ from: enc,to: 'UNICODE' } ) );
-      const rows = csv.split( /[\n\r]+/ ).map( row => row.split( /,/ ) );
-
-      const workbook = new ExcelJS.Workbook();
-      const workSheet = workbook.addWorksheet( 'Sheet1' );
-      rows.forEach( row => workSheet.addRow( row ) );
-
-      return D( workbook,fileName );
-    },
     readFromJson: async ( params ) => {
       if ( !window.ExcelJS ) {
         await amotify.config.readExtraCDN( cdn_excelJS );

package/src/@variables.tsx

@@ -1,70 +1,74 @@
 export const launchID = $.uuidGen();
 
-export const ColorKeys: amotify.ThemeColorTypes[] = [
-  'comun',
-  'leaf',
-  'heart',
-  'droplet',
-  'brick',
-  'flower',
-  'lip',
-  'wine',
-  'theater',
-  'bat',
-  'poizon',
-  'eggplant',
-  'ufo',
-  'alien',
-  'tombstone',
-  'ninja',
-  'moon',
-  'rain',
-  'unicorn',
-  'axe',
-  'gem',
-  'soap',
-  'drizzle',
-  'building',
-  'fish',
-  'icicles',
-  'water',
-  'tree1',
-  'tree2',
-  'tree3',
-  'battery',
-  'seedle',
-  'greenTea',
-  'oak',
-  'salad',
-  'cloudy',
-  'lemon',
-  'angel',
-  'parasol',
-  'pizza',
-  'thunder',
-  'latte',
-  'island',
-  'shovel',
-  'coffee',
-  'carrot',
-  'cactus',
-  'volcano',
-  'choco',
-  'industry',
-  'gun',
-  'galaxy',
-  'line',
-  'twitter',
-  'amazon',
-  'facebook',
-  'android',
-  'slackBlue',
-  'slackGreen',
-  'slackRed',
-  'slackYellow',
-  'slackBase',
-  'googleBlue',
-  'googleGreen',
-  'googleYellow',
-  'googleRed'
-];
+export const ColorObjects: {
+  key: amotify.ThemeColorTypes
+  isBrand: boolean
+  isAvocado: boolean
+}[] = [
+    { key: 'comun',isBrand: false,isAvocado: true },
+    { key: 'leaf',isBrand: false,isAvocado: true },
+    { key: 'heart',isBrand: false,isAvocado: true },
+    { key: 'droplet',isBrand: false,isAvocado: true },
+    { key: 'brick',isBrand: false,isAvocado: false },
+    { key: 'flower',isBrand: false,isAvocado: false },
+    { key: 'lip',isBrand: false,isAvocado: false },
+    { key: 'wine',isBrand: false,isAvocado: false },
+    { key: 'theater',isBrand: false,isAvocado: false },
+    { key: 'bat',isBrand: false,isAvocado: false },
+    { key: 'poizon',isBrand: false,isAvocado: false },
+    { key: 'eggplant',isBrand: false,isAvocado: false },
+    { key: 'ufo',isBrand: false,isAvocado: false },
+    { key: 'alien',isBrand: false,isAvocado: false },
+    { key: 'tombstone',isBrand: false,isAvocado: false },
+    { key: 'ninja',isBrand: false,isAvocado: false },
+    { key: 'moon',isBrand: false,isAvocado: false },
+    { key: 'rain',isBrand: false,isAvocado: false },
+    { key: 'unicorn',isBrand: false,isAvocado: false },
+    { key: 'axe',isBrand: false,isAvocado: false },
+    { key: 'gem',isBrand: false,isAvocado: false },
+    { key: 'soap',isBrand: false,isAvocado: false },
+    { key: 'drizzle',isBrand: false,isAvocado: false },
+    { key: 'building',isBrand: false,isAvocado: false },
+    { key: 'fish',isBrand: false,isAvocado: false },
+    { key: 'icicles',isBrand: false,isAvocado: false },
+    { key: 'water',isBrand: false,isAvocado: false },
+    { key: 'tree1',isBrand: false,isAvocado: false },
+    { key: 'tree2',isBrand: false,isAvocado: false },
+    { key: 'tree3',isBrand: false,isAvocado: false },
+    { key: 'battery',isBrand: false,isAvocado: false },
+    { key: 'seedle',isBrand: false,isAvocado: false },
+    { key: 'greenTea',isBrand: false,isAvocado: false },
+    { key: 'oak',isBrand: false,isAvocado: false },
+    { key: 'salad',isBrand: false,isAvocado: false },
+    { key: 'cloudy',isBrand: false,isAvocado: false },
+    { key: 'lemon',isBrand: false,isAvocado: false },
+    { key: 'angel',isBrand: false,isAvocado: false },
+    { key: 'parasol',isBrand: false,isAvocado: false },
+    { key: 'pizza',isBrand: false,isAvocado: false },
+    { key: 'thunder',isBrand: false,isAvocado: false },
+    { key: 'latte',isBrand: false,isAvocado: false },
+    { key: 'island',isBrand: false,isAvocado: false },
+    { key: 'shovel',isBrand: false,isAvocado: false },
+    { key: 'coffee',isBrand: false,isAvocado: false },
+    { key: 'carrot',isBrand: false,isAvocado: false },
+    { key: 'cactus',isBrand: false,isAvocado: false },
+    { key: 'volcano',isBrand: false,isAvocado: false },
+    { key: 'choco',isBrand: false,isAvocado: false },
+    { key: 'industry',isBrand: false,isAvocado: false },
+    { key: 'gun',isBrand: false,isAvocado: false },
+    { key: 'galaxy',isBrand: false,isAvocado: false },
+    { key: 'line',isBrand: true,isAvocado: false },
+    { key: 'twitter',isBrand: true,isAvocado: false },
+    { key: 'amazon',isBrand: true,isAvocado: false },
+    { key: 'facebook',isBrand: true,isAvocado: false },
+    { key: 'android',isBrand: true,isAvocado: false },
+    { key: 'slackBlue',isBrand: true,isAvocado: false },
+    { key: 'slackGreen',isBrand: true,isAvocado: false },
+    { key: 'slackRed',isBrand: true,isAvocado: false },
+    { key: 'slackYellow',isBrand: true,isAvocado: false },
+    { key: 'slackBase',isBrand: true,isAvocado: false },
+    { key: 'googleBlue',isBrand: true,isAvocado: false },
+    { key: 'googleGreen',isBrand: true,isAvocado: false },
+    { key: 'googleYellow',isBrand: true,isAvocado: false },
+    { key: 'googleRed',isBrand: true,isAvocado: false },
+  ];

package/src/config.tsx

@@ -30,7 +30,7 @@ export const deviceIdentifier = () => {
 
 import {
   launchID,
-  ColorKeys
+  ColorObjects
 } from './@variables';
 
 export const SetThemeColorTag = () => {
@@ -56,11 +56,19 @@ const DarkmodeColors: {
 
 const ThemeColors: {
   [ key in amotify.ThemeColorTypes ]: {
-    ( alfa?: number ): string
+    alfa( alfa?: number ): string
+    isBrand: boolean
+    isAvocado: boolean
   }
 } = {} as any;
-ColorKeys.forEach( ( key ) => {
-  ThemeColors[ key ] = ( alfa?: number ) => ( `hsla( var( --cH_${ key } ),var( --cS_${ key } ),var( --cL_${ key } ),${ alfa ?? 1 } ) ` );
+ColorObjects.forEach( ( ColorObject ) => {
+  let { key,isAvocado,isBrand } = ColorObject;
+
+  ThemeColors[ key ] = {
+    alfa: ( alfa?: number ) => ( `hsla( var( --cH_${ key } ),var( --cS_${ key } ),var( --cL_${ key } ),${ alfa ?? 1 } ) ` ),
+    isAvocado,
+    isBrand,
+  }
 } );
 
 export const defaultConfig: amotify.config.Methods = {
@@ -91,7 +99,7 @@ export const defaultConfig: amotify.config.Methods = {
       amotify.global.useRecycle.do( 'RootViewController' );
     },
     themeColor: ( value ) => {
-      if ( !ColorKeys.includes( value ) ) value = 'comun';
+      if ( !ColorObjects.find( ( ColorObject ) => ColorObject.key == value ) ) value = 'comun';
       if ( value == amotify.config.themeColor ) return;
 
       amotify.config.themeColor = value;