baseline-refactor

Author: tripolskypetr

packages/rn-declarative-eva/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-declarative-eva",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "A lighter version of the react-declarative which exports the <One /> component and dependencies only and as such makes the library slightly faster and smaller. Unlike react-declarative, it doesn't provide any additional overhead like state management. For a note, that library should be used when you want to use <One /> forms in existing app",
   "private": false,
   "author": {

packages/rn-declarative-eva/package.json

@@ -15,7 +15,7 @@ interface IOneSlotFactoryProps {
     children: React.ReactNode;
 }
 
-const defaultSlots = {
+export const defaultSlots = {
     CheckBox,
     Combo,
     Items,

packages/rn-declarative-eva/src/OneSlotFactory/OneSlotFactory.tsx

@@ -1,2 +1,3 @@
 export * from './OneSlotFactory';
+export { defaultSlots as OneDefaultSlots } from './OneSlotFactory';
 export { default } from './OneSlotFactory';

packages/rn-declarative-eva/src/OneSlotFactory/index.ts

@@ -1 +1,2 @@
 export { OneSlotFactory } from './OneSlotFactory';
+export { OneDefaultSlots } from './OneSlotFactory';

packages/rn-declarative-eva/src/index.ts

@@ -1,6 +1,6 @@
 {
   "name": "rn-declarative",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "description": "A lighter version of the react-declarative which exports the <One /> component and dependencies only and as such makes the library slightly faster and smaller. Unlike react-declarative, it doesn't provide any additional overhead like state management. For a note, that library should be used when you want to use <One /> forms in existing app",
   "private": false,
   "author": {

packages/rn-declarative/package-lock.json

@@ -17,6 +17,8 @@ import useManagedProps from './hooks/useManagedProps';
 import createFieldInternal from './config/createField';
 import createLayoutInternal from './config/createLayout';
 
+import isBaselineInternal from './config/isBaselineSimple';
+
 const DEFAULT_ONFOCUS = () => null;
 const DEFAULT_ONBLUR = () => null;
 const DEFAULT_ONPRESS = () => null;
@@ -58,6 +60,8 @@ export const One = <Data extends IAnything = IAnything, Payload = IAnything, Fie
     const {
         createField = createFieldInternal,
         createLayout = createLayoutInternal,
+        isBaseline = isBaselineInternal,
+        isBaselineForRoot = isBaselineInternal,
         apiRef,
         changeSubject,
         reloadSubject,
@@ -193,6 +197,8 @@ export const One = <Data extends IAnything = IAnything, Payload = IAnything, Fie
         ...memoizedProps,
         createField,
         createLayout,
+        isBaseline,
+        isBaselineForRoot,
         features,
     } as unknown as IOneProps<Data, IField<Data>>;
 

packages/rn-declarative/package.json

@@ -27,22 +27,25 @@ interface IContainerProps {
     isBaselineAlign?: boolean;
     children: React.ReactNode;
 }
-
 /**
  * В Yoga layout есть баг, если корневой компонент не baseline,
- * часть компоновок не покажется. Не зависит от UI kit, в будущем, нужно
- * добавить ветвление стилей и убрать `<Adjust />` для `noBaseline`
+ * часть компоновок не покажется. Не зависит от UI kit
+ * 
+ * Поэтому, вместо `isBaseline` используется `isBaselineSimple`, которая включает
+ * baseline всегда, если не указано `noBaseline`
  */
+const isBaselineAlign = true;
+
 export const Container = ({
     style,
     children,
 }: IContainerProps) => (
     <View style={[styles.root, style]}>
-        <View style={styles.withBaseline}>
+        <View style={isBaselineAlign ? styles.withBaseline : styles.noBaseline}>
             {children} 
         </View>
-        <Adjust />
+        {!isBaselineAlign && <Adjust />}
     </View>
 );
 
-export default Container;
+export default Container;

packages/rn-declarative/src/components/One/One.tsx

@@ -65,6 +65,7 @@ export const OneGenesis = <
   const oneConfig = useSingleton(OneConfig[GET_REF_SYMBOL]);
 
   const {
+    isBaselineForRoot = isBaselineForField,
     change = DEFAULT_CHANGE,
     ready = DEFAULT_READY,
     fields = [],
@@ -176,7 +177,7 @@ export const OneGenesis = <
    * Корневой компонент привязывает поля к нижнему краю только если
    * нет ни одной компоновки
    */
-  const isBaselineAlign = useMemo(() => fieldsSnapshot.every(isBaselineForField), []);
+  const isBaselineAlign = useMemo(() => fieldsSnapshot.every(isBaselineForRoot), []);
 
   return (
     <CacheProvider>