GH-38 Review fixes

agentlab · Oct 12, 2021 · d9e63a7 · d9e63a7
1 parent 396937e
commit d9e63a7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/layouts/AntdFormLayout.tsx b/src/layouts/AntdFormLayout.tsx
@@ -83,7 +83,7 @@ export const AntdFormLayout: React.FC<any> = ({
     <AutoSizer>
       {({ width, height }: any) => (
         <div style={{ width, height, overflow: 'auto', position: 'relative', ...style }} onClick={() => onEdit()}>
-          <span style={{ padding: '7px', fontSize: '2em' }}>{title}</span>
+          {title && <span style={{ padding: '7px', fontSize: '2em' }}>{title}</span>}
           {readOnly ? null : <LogicalButton form={id} onSave={onSave} onCancel={onCancel} />}
           <Form labelAlign={'left'}>
             <AntdVerticalLayoutWithStore

diff --git a/src/layouts/AntdVerticalLayout.tsx b/src/layouts/AntdVerticalLayout.tsx
@@ -9,7 +9,7 @@
  ********************************************************************************/
 import React from 'react';
 import { Row, Col } from 'antd';
-
+import { getSnapshot } from 'mobx-state-tree';
 import { FormsDispatchProps, FormsDispatch } from '../Form';
 import { rankWith, uiTypeIs, RankedTester } from '../testers';
 import { withLayoutProps } from '../util/ContextToProps';
@@ -30,7 +30,8 @@ export const AntdVerticalLayoutRenderer: React.FC<LayoutComponent> = ({
 }) => {
   const style = viewKindElement.options?.style;
   const Render: React.FC<FormsDispatchProps & Idx> = ({ idx, viewKind, viewKindElement, viewDescr, enabled }) => {
-    const options = viewKindElement.options || {};
+    const height = viewKindElement.options?.style?.height;
+    console.log('OPT', viewKindElement, height);
     const newViewKindElement = { ...viewKindElement };
     if (newViewKindElement.options) {
       newViewKindElement.options.style = {};
@@ -39,8 +40,8 @@ export const AntdVerticalLayoutRenderer: React.FC<LayoutComponent> = ({
       <Row
         style={{
           position: 'relative',
-          width: '100%',
-          height: '100%',
+          width: '100%', //
+          height,
           //flex: viewKindElement.options && viewKindElement.options.height === 'all-empty-space' ? '1 1 auto' : '',
         }}>
         <Col span={24} style={{ position: 'relative' }}>

diff --git a/src/util/layout.tsx b/src/util/layout.tsx
@@ -35,7 +35,7 @@ export const renderLayoutElements = ({
   //const sort = id ? viewKind.properties && viewKind.properties[id] && viewKind.properties[id].order : undefined;
   if (!elements || elements.length === 0) return <></>;
   return elements.map((el: IViewKindElement, idx: number) => {
-    el = { ...el, options: { ...el.options, readOnly } };
+    el = { ...el, options: { readOnly, ...el.options } };
     return (
       <Render key={idx} idx={idx} viewKind={viewKind} viewKindElement={el} viewDescr={viewDescr} enabled={enabled} />
     );

diff --git a/stories/FormWithColumns.stories.tsx b/stories/FormWithColumns.stories.tsx
@@ -102,10 +102,13 @@ const viewKinds = [
         },
         elements: [
           {
-            '@id': 'rm:_83hd7f',
+            '@id': 'rm:_834hd7f',
             '@type': 'aldkg:FormLayout',
             options: {
-              readOnly: false,
+              style: {
+                height: '100%',
+              },
+              readOnly: true,
             },
             elements: [
               {