@carbonorm/carbonreact 2.0.1 → 2.0.3

package/dist/CarbonReact.d.ts

@@ -1,24 +1,24 @@
 import React, { ReactNode } from 'react';
 import 'react-toastify/dist/ReactToastify.min.css';
 import { iRestfulObjectArrayTypes } from "variables/C6";
-export interface iCarbonORMState {
+export interface iCarbonReactState {
     alertsWaiting: any[];
     websocketEvents: MessageEvent[];
     websocketData: any[];
     websocket?: WebSocket;
     backendThrowable: any[];
 }
-export declare const initialRequiredCarbonORMState: iCarbonORMState;
-export declare const initialCarbonORMState: iCarbonORMState;
+export declare const initialRequiredCarbonORMState: iCarbonReactState;
+export declare const initialCarbonReactState: iCarbonReactState;
 export default class CarbonReact<P = {}, S = {}> extends React.Component<{
     children?: ReactNode | ReactNode[];
-} & P, (iRestfulObjectArrayTypes | S) & iCarbonORMState> {
+} & P, (iRestfulObjectArrayTypes | S) & iCarbonReactState> {
     static instance: CarbonReact;
     static lastLocation: string;
     static whyDidYouRender: boolean;
     constructor(props: any);
     websocketTimeout: number;
-    shouldComponentUpdate(nextProps: Readonly<any>, nextState: Readonly<iCarbonORMState>, _nextContext: any): boolean;
-    componentDidUpdate(_prevProps: Readonly<any>, _prevState: Readonly<iCarbonORMState>, _snapshot?: any): void;
+    shouldComponentUpdate(nextProps: Readonly<any>, nextState: Readonly<iCarbonReactState>, _nextContext: any): boolean;
+    componentDidUpdate(_prevProps: Readonly<any>, _prevState: Readonly<iCarbonReactState>, _snapshot?: any): void;
     render(): import("react/jsx-runtime").JSX.Element;
 }

package/dist/hoc/deleteRestfulObjectArrays.d.ts

@@ -1,3 +1,3 @@
-import { iCarbonORMState } from "CarbonReact";
+import { iCarbonReactState } from "CarbonReact";
 import { iRestfulObjectArrayTypes, tRestfulObjectValues } from "variables/C6";
-export default function deleteRestfulObjectArrays<ObjectType = tRestfulObjectValues, ObjectArrayTypes = iRestfulObjectArrayTypes>(dataOrCallback: ((prev: Readonly<iCarbonORMState>) => ObjectType[]) | ObjectType[], stateKey: keyof ObjectArrayTypes, uniqueObjectId: keyof ObjectType, callback?: () => void): void;
+export default function deleteRestfulObjectArrays<ObjectType = tRestfulObjectValues, ObjectArrayTypes = iRestfulObjectArrayTypes>(dataOrCallback: ((prev: Readonly<iCarbonReactState>) => ObjectType[]) | ObjectType[], stateKey: keyof ObjectArrayTypes, uniqueObjectId: keyof ObjectType, callback?: () => void): void;

package/dist/hoc/updateRestfulObjectArrays.d.ts

@@ -1,4 +1,4 @@
-import { iCarbonORMState } from "CarbonReact";
+import { iCarbonReactState } from "CarbonReact";
 import { iRestfulObjectArrayTypes, tRestfulObjectValues } from "variables/C6";
 export declare enum eUpdateInsertMethod {
     REPLACE = 0,
@@ -15,4 +15,4 @@ export declare enum eUpdateInsertMethod {
  * @param callback - if you want to do something with the updated state, you can pass a callback here. Run as the second
  *  parameter of setState.
  */
-export default function updateRestfulObjectArray<ObjectType = tRestfulObjectValues, ObjectArrayTypes = iRestfulObjectArrayTypes>(dataOrCallback: ((prev: Readonly<iCarbonORMState>) => ObjectType[]) | ObjectType[], stateKey: keyof ObjectArrayTypes, uniqueObjectId: keyof ObjectType, insertUpdateOrder?: eUpdateInsertMethod, callback?: () => void): void;
+export default function updateRestfulObjectArrays<ObjectType = tRestfulObjectValues, ObjectArrayTypes = iRestfulObjectArrayTypes>(dataOrCallback: ((prev: Readonly<iCarbonReactState>) => ObjectType[]) | ObjectType[], stateKey: keyof ObjectArrayTypes, uniqueObjectId: keyof ObjectType, insertUpdateOrder?: eUpdateInsertMethod, callback?: () => void): void;

package/dist/hoc/uploadImage.d.ts

@@ -1,4 +1,4 @@
 import { ChangeEvent } from "react";
 export declare function toDataURL(src: string, fileType: string, callback: (dataUriEncoded: string) => void): Promise<void>;
-export declare function uploadImageChange(event: ChangeEvent<HTMLInputElement>, uploadCallback: ((imageDataUri: string) => void)): void;
+export declare function uploadImageChange(event: ChangeEvent<HTMLInputElement>, uploadCallback: (dataUriBase64: string) => void): Promise<void>;
 export default function uploadImage(uploadCallback: (dataUriBase64: string) => void): () => void;

package/dist/index.cjs.js

@@ -2781,13 +2781,13 @@ var initialRequiredCarbonORMState = {
     websocketData: [],
     websocketEvents: [],
 };
-var initialCarbonORMState = __assign(__assign({}, initialRequiredCarbonORMState), initialRestfulObjectsState);
+var initialCarbonReactState = __assign(__assign({}, initialRequiredCarbonORMState), initialRestfulObjectsState);
 var CarbonReact = /** @class */ (function (_super) {
     __extends(CarbonReact, _super);
     function CarbonReact(props) {
         var _this = _super.call(this, props) || this;
         _this.websocketTimeout = 5000;
-        _this.state = initialCarbonORMState;
+        _this.state = initialCarbonReactState;
         CarbonReact.instance = _this;
         // This should only ever be done here, when the full state is being trashed.
         carbonnode.clearCache({
@@ -3438,7 +3438,7 @@ exports.eUpdateInsertMethod = void 0;
  * @param callback - if you want to do something with the updated state, you can pass a callback here. Run as the second
  *  parameter of setState.
  */
-function updateRestfulObjectArray(dataOrCallback, stateKey, uniqueObjectId, insertUpdateOrder, callback) {
+function updateRestfulObjectArrays(dataOrCallback, stateKey, uniqueObjectId, insertUpdateOrder, callback) {
     if (insertUpdateOrder === void 0) { insertUpdateOrder = exports.eUpdateInsertMethod.LAST; }
     var bootstrap = CarbonReact.instance;
     return bootstrap.setState(function (previousBootstrapState) {
@@ -3501,35 +3501,77 @@ function toDataURL(src, fileType, callback) {
     });
 }
 function uploadImageChange(event, uploadCallback) {
-    if (event.target.files !== null && event.target.files[0]) {
-        Object.keys(event.target.files).forEach(function (index) {
-            var _a;
-            var file = (_a = event.target.files) === null || _a === void 0 ? void 0 : _a[index];
-            // loop through all files and create data url then post to postPost
-            if (file.type.match('image.*')) {
-                // get file extension
-                var fileExtension = file.name.split('.').pop();
-                // check file extension is valid data uri
-                if (fileExtension !== 'jpg' && fileExtension !== 'jpeg' && fileExtension !== 'png' && fileExtension !== 'gif') {
-                    reactToastify.toast.error('Please upload a valid image file type (jpg, jpeg, png, gif).');
-                    return;
-                }
-                // @link https://github.com/palantir/tslint/issues/4653
-                // @link https://github.com/Microsoft/TypeScript/issues/13376#issuecomment-273289748
-                void toDataURL(URL.createObjectURL(file), file.type, uploadCallback);
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function () {
+        var _this = this;
+        return __generator(this, function (_c) {
+            if (event.target.files === null || undefined === ((_b = (_a = event.target) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0])) {
+                reactToastify.toast.error('Please upload a valid image file type (jpg, jpeg, png, gif, heic).');
+                return [2 /*return*/];
             }
+            Object.keys(event.target.files).forEach(function (index) {
+                (function () { return __awaiter(_this, void 0, void 0, function () {
+                    var file, fileExtension, isHeic;
+                    var _a;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                file = (_a = event.target.files) === null || _a === void 0 ? void 0 : _a[index];
+                                // loop through all files and create data url then post to postPost
+                                if (false === file.type.match('image.*')) {
+                                    reactToastify.toast.error('Please upload a valid image file type (jpg, jpeg, png, gif, heic). (E_IMAGE_*<>' + file.type + ')');
+                                    return [2 /*return*/];
+                                }
+                                fileExtension = file.name.split('.').pop();
+                                // check file extension is valid data uri
+                                if (fileExtension !== 'jpg'
+                                    && fileExtension !== 'jpeg'
+                                    && fileExtension !== 'heic'
+                                    && fileExtension !== 'png'
+                                    && fileExtension !== 'gif') {
+                                    reactToastify.toast.error('Please upload a valid image file type (jpg, jpeg, png, gif, heic). (E_IMAGE_EXT)');
+                                    return [2 /*return*/];
+                                }
+                                isHeic = fileExtension === 'heic';
+                                if (!isHeic) return [3 /*break*/, 2];
+                                return [4 /*yield*/, React.lazy(function () { return require("heic2any"); })];
+                            case 1:
+                                // todo - this should be code split and lazy loaded, but doesn't work
+                                // look up code splitting, it could be an issue with rewired
+                                file = (_b.sent())({
+                                    blob: file,
+                                    toType: "image/webp",
+                                    quality: 1.0, // 0.5 cuts the quality and size by half
+                                });
+                                _b.label = 2;
+                            case 2:
+                                // @link https://github.com/palantir/tslint/issues/4653
+                                // @link https://github.com/Microsoft/TypeScript/issues/13376#issuecomment-273289748
+                                void toDataURL(URL.createObjectURL(file), 'image/webp', uploadCallback);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })();
+            });
+            return [2 /*return*/];
         });
-    }
+    });
 }
 // dataUriEncoded is the base64 encoded string which is posted in column post_content
 function uploadImage(uploadCallback) {
     return function () {
         var input = document.createElement('input');
         input.type = 'file';
-        input.accept = 'image/*';
-        input.onchange = function (e) {
-            uploadImageChange(e, uploadCallback);
-        };
+        input.accept = 'image/*, .heic';
+        input.style.display = 'none';
+        // the element must be appended to the document to work on safari
+        // @link https://stackoverflow.com/questions/47664777/javascript-file-input-onchange-not-working-ios-safari-only
+        document.body.appendChild(input);
+        // safari also requires addEventListener rather than .onChange
+        input.addEventListener('change', function (e) {
+            console.log('upload image event', e);
+            void uploadImageChange(e, uploadCallback);
+        });
         input.click();
     };
 }
@@ -3583,7 +3625,7 @@ exports.group_references = group_references;
 exports.groups = groups;
 exports.hexToRgb = hexToRgb;
 exports.history_logs = history_logs;
-exports.initialCarbonORMState = initialCarbonORMState;
+exports.initialCarbonReactState = initialCarbonReactState;
 exports.initialRequiredCarbonORMState = initialRequiredCarbonORMState;
 exports.initialRestfulObjectsState = initialRestfulObjectsState;
 exports.isEdgeBrowser = isEdgeBrowser;
@@ -3598,7 +3640,7 @@ exports.scrollIntoView = ScrollIntoViewDirective;
 exports.setCookies = setCookies;
 exports.setUrl = setUrl;
 exports.toDataURL = toDataURL;
-exports.updateRestfulObjectArrays = updateRestfulObjectArray;
+exports.updateRestfulObjectArrays = updateRestfulObjectArrays;
 exports.uploadImage = uploadImage;
 exports.uploadImageChange = uploadImageChange;
 exports.user_followers = user_followers;