@sutech_jp/raas-react-client 0.0.10 → 0.0.12

package/dist/ReportPaperForm.d.ts

@@ -1,3 +1,3 @@
 import { ReactElement } from 'react';
 import { ReportPaperFormProps } from './types';
-export declare const ReportPaperForm: <D>({ url, layoutId, data, onDataUpdate, customData, onCustomDataUpdate, onRender, reportOptions, layout, onLayoutUpdate, editability, layoutEditable, }: ReportPaperFormProps<D>) => ReactElement;
+export declare const ReportPaperForm: <D>({ url, layoutId, data, onDataUpdate, customData, onCustomDataUpdate, onRender, reportOptions, layout, onLayoutUpdate, editability, layoutEditable, version, }: ReportPaperFormProps<D>) => ReactElement;

package/dist/ReportPaperForm.js

@@ -31,7 +31,7 @@ exports.ReportPaperForm = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var ReportPaperForm = function (_a) {
-    var url = _a.url, layoutId = _a.layoutId, data = _a.data, onDataUpdate = _a.onDataUpdate, customData = _a.customData, onCustomDataUpdate = _a.onCustomDataUpdate, onRender = _a.onRender, reportOptions = _a.reportOptions, layout = _a.layout, onLayoutUpdate = _a.onLayoutUpdate, _b = _a.editability, editability = _b === void 0 ? 'none' : _b, _c = _a.layoutEditable, layoutEditable = _c === void 0 ? false : _c;
+    var url = _a.url, layoutId = _a.layoutId, data = _a.data, onDataUpdate = _a.onDataUpdate, customData = _a.customData, onCustomDataUpdate = _a.onCustomDataUpdate, onRender = _a.onRender, reportOptions = _a.reportOptions, layout = _a.layout, onLayoutUpdate = _a.onLayoutUpdate, _b = _a.editability, editability = _b === void 0 ? 'none' : _b, _c = _a.layoutEditable, layoutEditable = _c === void 0 ? false : _c, version = _a.version;
     var _d = __read((0, react_1.useState)('unauthorized'), 2), formState = _d[0], setFormState = _d[1];
     var _e = __read((0, react_1.useState)(), 2), contentHeight = _e[0], setContentHeight = _e[1];
     var _f = __read((0, react_1.useState)(false), 2), layoutInitialized = _f[0], setLayoutInitialized = _f[1];
@@ -53,7 +53,7 @@ var ReportPaperForm = function (_a) {
             editability: editability,
             layoutEditable: layoutEditable,
         }, '*');
-    }, [formState, layoutId, editability, layout, layoutEditable]);
+    }, [formState, layoutId, editability, layout, layoutEditable, version]);
     (0, react_1.useEffect)(function () {
         var _a;
         if (formState === 'unauthorized')
@@ -85,9 +85,9 @@ var ReportPaperForm = function (_a) {
         }
         else if (action === 'onReady') {
             setLayoutInitialized(true);
-            setContentHeight(message === null || message === void 0 ? void 0 : message.contentHeight);
         }
         else if (action === 'onRender') {
+            setContentHeight(message === null || message === void 0 ? void 0 : message.contentHeight);
             if (onRender)
                 onRender((message === null || message === void 0 ? void 0 : message.hasRequiredBlank) || false);
         }
@@ -103,7 +103,6 @@ var ReportPaperForm = function (_a) {
         }
         else if (action === 'onEditLayout') {
             var layout_1 = message.layout;
-            setContentHeight(message === null || message === void 0 ? void 0 : message.contentHeight);
             if (onLayoutUpdate)
                 onLayoutUpdate(layout_1);
         }

package/dist/types.d.ts

@@ -21,6 +21,7 @@ export declare type PaperFormArgs<D> = {
     onRender?: (hasRequiredBlank: boolean) => void;
     reportOptions?: ReportOptions;
     editability?: UserEditability;
+    version: number;
 } & (LayoutEditable | LayoutNotEditable);
 export declare type ReportPaperFormProps<D> = {
     url: string;

package/dist/useReportPaperForm.js

@@ -24,8 +24,9 @@ var useReportPaperForm = function (initialData, options) {
     var _c = __read((0, react_1.useState)([]), 2), customData = _c[0], setCustomData = _c[1];
     var _d = __read((0, react_1.useState)([]), 2), reportOptions = _d[0], setReportOptions = _d[1];
     var _e = __read((0, react_1.useState)(), 2), layout = _e[0], setLayout = _e[1];
-    var _f = __read((0, react_1.useState)(false), 2), dirty = _f[0], setDirty = _f[1];
-    var _g = __read((0, react_1.useState)(false), 2), hasRequiredBlank = _g[0], setHasRequiredBlank = _g[1];
+    var _f = __read((0, react_1.useState)(0), 2), version = _f[0], setVersion = _f[1]; // flag to force update layout
+    var _g = __read((0, react_1.useState)(false), 2), dirty = _g[0], setDirty = _g[1];
+    var _h = __read((0, react_1.useState)(false), 2), hasRequiredBlank = _h[0], setHasRequiredBlank = _h[1];
     var onInitialize = (0, react_1.useCallback)(function (data) {
         setData(data);
         setOriginalData(data);
@@ -33,6 +34,7 @@ var useReportPaperForm = function (initialData, options) {
         setReportOptions([]);
         setLayout(undefined);
         setDirty(false);
+        setVersion(function (v) { return v + 1; });
     }, []);
     var onReset = (0, react_1.useCallback)(function () {
         setData(originalData);
@@ -40,6 +42,7 @@ var useReportPaperForm = function (initialData, options) {
         setReportOptions([]);
         setLayout(undefined);
         setDirty(false);
+        setVersion(function (v) { return v + 1; });
     }, [originalData]);
     var onDataUpdate = (0, react_1.useCallback)(function (data, options) {
         setData(data);
@@ -73,6 +76,7 @@ var useReportPaperForm = function (initialData, options) {
             onRender: onRender,
             editability: (options === null || options === void 0 ? void 0 : options.editability) || 'none',
             layoutEditable: (options === null || options === void 0 ? void 0 : options.layoutEditable) || false,
+            version: version,
         },
         generatePdfArgs: {
             data: data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sutech_jp/raas-react-client",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "react client for raas produced by SuTech",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",