@sutech_jp/raas-react-client 0.0.7 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -33,16 +33,15 @@ var react_1 = require("react");
33
33
  var ReportPaperForm = function (_a) {
34
34
  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;
35
35
  var _d = __read((0, react_1.useState)('unauthorized'), 2), formState = _d[0], setFormState = _d[1];
36
- var _e = __read((0, react_1.useState)(), 2), renderedLayoutId = _e[0], setRenderedLayoutId = _e[1];
37
- var _f = __read((0, react_1.useState)(), 2), contentHeight = _f[0], setContentHeight = _f[1];
36
+ var _e = __read((0, react_1.useState)(), 2), contentHeight = _e[0], setContentHeight = _e[1];
37
+ var _f = __read((0, react_1.useState)(false), 2), layoutInitialized = _f[0], setLayoutInitialized = _f[1];
38
38
  var iframe = (0, react_1.useRef)(null);
39
39
  (0, react_1.useEffect)(function () {
40
40
  var _a;
41
- if (formState === 'unauthorized' || layoutId === undefined || renderedLayoutId === layoutId) {
41
+ if (formState === 'unauthorized')
42
+ return;
43
+ if (layoutId === undefined)
42
44
  return;
43
- }
44
- // set the layout id as rendered immediately
45
- setRenderedLayoutId(layoutId);
46
45
  var iframeWindow = (_a = iframe.current) === null || _a === void 0 ? void 0 : _a.contentWindow;
47
46
  if (!iframeWindow)
48
47
  return;
@@ -54,10 +53,14 @@ var ReportPaperForm = function (_a) {
54
53
  editability: editability,
55
54
  layoutEditable: layoutEditable,
56
55
  }, '*');
57
- }, [formState, layoutId, editability, renderedLayoutId, layout, layoutEditable]);
56
+ }, [formState, layoutId, editability, layout, layoutEditable]);
58
57
  (0, react_1.useEffect)(function () {
59
58
  var _a;
60
- if ((formState !== 'ready' && formState !== 'rendered') || !data)
59
+ if (formState === 'unauthorized')
60
+ return;
61
+ if (!layoutInitialized)
62
+ return;
63
+ if (!data)
61
64
  return;
62
65
  var iframeWindow = (_a = iframe.current) === null || _a === void 0 ? void 0 : _a.contentWindow;
63
66
  if (!iframeWindow)
@@ -69,7 +72,7 @@ var ReportPaperForm = function (_a) {
69
72
  customData: customData,
70
73
  options: reportOptions,
71
74
  }, '*');
72
- }, [formState, data, customData, reportOptions]);
75
+ }, [formState, layoutInitialized, data, customData, reportOptions]);
73
76
  var handleMessage = (0, react_1.useCallback)(function (e) {
74
77
  var message = e.data;
75
78
  var from = message === null || message === void 0 ? void 0 : message.from;
@@ -81,13 +84,12 @@ var ReportPaperForm = function (_a) {
81
84
  setFormState('authorized');
82
85
  }
83
86
  else if (action === 'onReady') {
84
- setFormState('ready');
87
+ setLayoutInitialized(true);
85
88
  }
86
89
  else if (action === 'onRender') {
87
90
  setContentHeight(message === null || message === void 0 ? void 0 : message.contentHeight);
88
91
  if (onRender)
89
92
  onRender((message === null || message === void 0 ? void 0 : message.hasRequiredBlank) || false);
90
- setFormState('rendered');
91
93
  }
92
94
  else if (action === 'onBusinessDataUpdate') {
93
95
  var updated = message.updated, options = message.options;
package/dist/types.d.ts CHANGED
@@ -2,7 +2,7 @@ export declare type Layout = any;
2
2
  export declare type CustomData = any[];
3
3
  export declare type ReportOptions = any[];
4
4
  export declare type UserEditability = 'all' | 'customDataOnly' | 'none';
5
- export declare type FormState = 'unauthorized' | 'authorized' | 'ready' | 'rendered';
5
+ export declare type FormState = 'unauthorized' | 'authorized';
6
6
  declare type LayoutEditable = {
7
7
  layoutEditable: true;
8
8
  layout: Layout;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sutech_jp/raas-react-client",
3
- "version": "0.0.7",
3
+ "version": "0.0.9",
4
4
  "description": "react client for raas produced by SuTech",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",