Revert "[v2] Typings for styling options and layouts (#3626)"

This reverts commit d5839a5392.

lib/src/Navigation.ts

@@ -64,28 +64,28 @@ export class Navigation {
   /**
    * Reset the app to a new layout
    */
-  public setRoot(layout: LayoutRoot): Promise<any> {
+  public setRoot(layout): Promise<any> {
     return this.commands.setRoot(layout);
   }
 
   /**
    * Set default options to all screens. Useful for declaring a consistent style across the app.
    */
-  public setDefaultOptions(options: Options): void {
+  public setDefaultOptions(options): void {
     this.commands.setDefaultOptions(options);
   }
 
   /**
    * Change a component's navigation options
    */
-  public mergeOptions(componentId: string, options: Options): void {
+  public mergeOptions(componentId: string, options): void {
     this.commands.mergeOptions(componentId, options);
   }
 
   /**
    * Show a screen as a modal.
    */
-  public showModal(layout: Layout): Promise<any> {
+  public showModal(layout): Promise<any> {
     return this.commands.showModal(layout);
   }
 
@@ -106,7 +106,7 @@ export class Navigation {
   /**
    * Push a new layout into this screen's navigation stack.
    */
-  public push(componentId: string, layout: Layout): Promise<any> {
+  public push(componentId: string, layout): Promise<any> {
     return this.commands.push(componentId, layout);
   }
 
@@ -134,14 +134,14 @@ export class Navigation {
   /**
    * Sets new root component to stack.
    */
-  public setStackRoot(componentId: string, layout: Layout): Promise<any> {
+  public setStackRoot(componentId: string, layout): Promise<any> {
     return this.commands.setStackRoot(componentId, layout);
   }
 
   /**
    * Show overlay on top of the entire app
    */
-  public showOverlay(layout: Layout): Promise<any> {
+  public showOverlay(layout): Promise<any> {
     return this.commands.showOverlay(layout);
   }
 

lib/src/commands/Commands.test.ts

@@ -54,7 +54,7 @@ describe('Commands', () => {
 
     it('deep clones input to avoid mutation errors', () => {
       const obj = {};
-      uut.setRoot({ root: { component: { name: 'bla', inner: obj } as any } });
+      uut.setRoot({ root: { component: { name: 'bla', inner: obj } } });
       expect(mockCommandsSender.setRoot.mock.calls[0][1].root.data.inner).not.toBe(obj);
     });
 
@@ -137,12 +137,12 @@ describe('Commands', () => {
   describe('mergeOptions', () => {
     it('deep clones input to avoid mutation errors', () => {
       const obj = { title: 'test' };
-      uut.mergeOptions('theComponentId', obj as any);
+      uut.mergeOptions('theComponentId', obj);
       expect(mockCommandsSender.mergeOptions.mock.calls[0][1]).not.toBe(obj);
     });
 
     it('passes options for component', () => {
-      uut.mergeOptions('theComponentId', { title: '1' } as any);
+      uut.mergeOptions('theComponentId', { title: '1' });
       expect(mockCommandsSender.mergeOptions).toHaveBeenCalledTimes(1);
       expect(mockCommandsSender.mergeOptions).toHaveBeenCalledWith('theComponentId', { title: '1' });
     });
@@ -151,7 +151,7 @@ describe('Commands', () => {
   describe('setDefaultOptions', () => {
     it('deep clones input to avoid mutation errors', () => {
       const obj = { title: 'test' };
-      uut.setDefaultOptions(obj as any);
+      uut.setDefaultOptions(obj);
       expect(mockCommandsSender.setDefaultOptions.mock.calls[0][0]).not.toBe(obj);
     });
   });
@@ -177,7 +177,7 @@ describe('Commands', () => {
 
     it('deep clones input to avoid mutation errors', () => {
       const obj = {};
-      uut.showModal({ component: { name: 'name', inner: obj } as any });
+      uut.showModal({ component: { name: 'name', inner: obj } });
       expect(mockCommandsSender.showModal.mock.calls[0][1].data.inner).not.toBe(obj);
     });
 
@@ -271,7 +271,7 @@ describe('Commands', () => {
           duration: 0.8
         }
       };
-      uut.pop('theComponentId', options as any);
+      uut.pop('theComponentId', options);
       expect(mockCommandsSender.pop).toHaveBeenCalledTimes(1);
       expect(mockCommandsSender.pop).toHaveBeenCalledWith('pop+UNIQUE_ID', 'theComponentId', options);
     });
@@ -348,7 +348,7 @@ describe('Commands', () => {
 
     it('deep clones input to avoid mutation errors', () => {
       const obj = {};
-      uut.showOverlay({ component: { name: 'name', inner: obj } as any });
+      uut.showOverlay({ component: { name: 'name', inner: obj } });
       expect(mockCommandsSender.showOverlay.mock.calls[0][1].data.inner).not.toBe(obj);
     });
 

lib/src/commands/Commands.ts

@@ -2,8 +2,6 @@ import * as _ from 'lodash';
 import { CommandsObserver } from '../events/CommandsObserver';
 import { NativeCommandsSender } from '../adapters/NativeCommandsSender';
 import { UniqueIdProvider } from '../adapters/UniqueIdProvider';
-import { Options } from '../interfaces/Options';
-import { Layout, LayoutRoot } from '../interfaces/Layout';
 
 export class Commands {
   constructor(
@@ -14,7 +12,7 @@ export class Commands {
     private readonly uniqueIdProvider: UniqueIdProvider) {
   }
 
-  public setRoot(simpleApi: LayoutRoot) {
+  public setRoot(simpleApi) {
     const input = _.cloneDeep(simpleApi);
     const root = this.layoutTreeParser.parse(input.root);
     this.layoutTreeCrawler.crawl(root);
@@ -37,7 +35,7 @@ export class Commands {
     return result;
   }
 
-  public setDefaultOptions(options: Options) {
+  public setDefaultOptions(options) {
     const input = _.cloneDeep(options);
     this.layoutTreeCrawler.processOptions(input);
 
@@ -45,7 +43,7 @@ export class Commands {
     this.commandsObserver.notify('setDefaultOptions', { options });
   }
 
-  public mergeOptions(componentId: string, options: Options) {
+  public mergeOptions(componentId, options) {
     const input = _.cloneDeep(options);
     this.layoutTreeCrawler.processOptions(input);
 
@@ -53,7 +51,7 @@ export class Commands {
     this.commandsObserver.notify('mergeOptions', { componentId, options });
   }
 
-  public showModal(simpleApi: Layout) {
+  public showModal(simpleApi) {
     const input = _.cloneDeep(simpleApi);
     const layout = this.layoutTreeParser.parse(input);
     this.layoutTreeCrawler.crawl(layout);
@@ -64,7 +62,7 @@ export class Commands {
     return result;
   }
 
-  public dismissModal(componentId: string) {
+  public dismissModal(componentId) {
     const commandId = this.uniqueIdProvider.generate('dismissModal');
     const result = this.nativeCommandsSender.dismissModal(commandId, componentId);
     this.commandsObserver.notify('dismissModal', { commandId, componentId });
@@ -78,7 +76,7 @@ export class Commands {
     return result;
   }
 
-  public push(componentId: string, simpleApi: Layout) {
+  public push(componentId, simpleApi) {
     const input = _.cloneDeep(simpleApi);
 
     const layout = this.layoutTreeParser.parse(input);
@@ -90,28 +88,28 @@ export class Commands {
     return result;
   }
 
-  public pop(componentId: string, options: Options) {
+  public pop(componentId, options) {
     const commandId = this.uniqueIdProvider.generate('pop');
     const result = this.nativeCommandsSender.pop(commandId, componentId, options);
     this.commandsObserver.notify('pop', { commandId, componentId, options });
     return result;
   }
 
-  public popTo(componentId: string) {
+  public popTo(componentId) {
     const commandId = this.uniqueIdProvider.generate('popTo');
     const result = this.nativeCommandsSender.popTo(commandId, componentId);
     this.commandsObserver.notify('popTo', { commandId, componentId });
     return result;
   }
 
-  public popToRoot(componentId: string) {
+  public popToRoot(componentId) {
     const commandId = this.uniqueIdProvider.generate('popToRoot');
     const result = this.nativeCommandsSender.popToRoot(commandId, componentId);
     this.commandsObserver.notify('popToRoot', { commandId, componentId });
     return result;
   }
 
-  public setStackRoot(componentId: string, simpleApi: Layout) {
+  public setStackRoot(componentId, simpleApi) {
     const input = _.cloneDeep(simpleApi);
 
     const layout = this.layoutTreeParser.parse(input);
@@ -123,7 +121,7 @@ export class Commands {
     return result;
   }
 
-  public showOverlay(simpleApi: Layout) {
+  public showOverlay(simpleApi) {
     const input = _.cloneDeep(simpleApi);
 
     const layout = this.layoutTreeParser.parse(input);
@@ -135,7 +133,7 @@ export class Commands {
     return result;
   }
 
-  public dismissOverlay(componentId: string) {
+  public dismissOverlay(componentId) {
     const commandId = this.uniqueIdProvider.generate('dismissOverlay');
     const result = this.nativeCommandsSender.dismissOverlay(commandId, componentId);
     this.commandsObserver.notify('dismissOverlay', { commandId, componentId });

lib/src/interfaces/Layout.ts

@@ -1,142 +0,0 @@
-import { Options, OptionsSplitView } from './Options';
-
-export interface LayoutComponent {
-  /**
-   * Component reference id, Auto generated if empty
-   */
-  id?: string;
-  /**
-   * Name of your component
-   */
-  name: string;
-  /**
-   * Styling options
-   */
-  options?: Options;
-  /**
-   * Properties to pass down to the component
-   */
-  passProps?: object;
-}
-
-export interface LayoutStackChildren {
-  /**
-   * Set component
-   */
-  component?: LayoutComponent;
-}
-
-export interface LayoutStack {
-  /**
-   * Set ID of the stack so you can use Navigation.mergeOptions to
-   * update options
-   */
-  id?: string;
-  /**
-   * Set children screens
-   */
-  children?: LayoutStackChildren[];
-  /**
-   * Set options
-   */
-  options?: Options;
-}
-
-export interface LayoutBottomTabsChildren {
-  /**
-   * Set stack
-   */
-  stack?: LayoutStack;
-  /**
-   * Set component
-   */
-  component?: LayoutComponent;
-}
-
-export interface LayoutBottomTabs {
-  /**
-   * Set ID of the stack so you can use Navigation.mergeOptions to
-   * update options
-   */
-  id?: string;
-  /**
-   * Set the children screens
-   */
-  children?: LayoutBottomTabsChildren[];
-  /**
-   * Set the bottom tabs options
-   */
-  options?: Options;
-}
-
-export interface LayoutSideMenu {
-  /**
-   * Set ID of the stack so you can use Navigation.mergeOptions to
-   * update options
-   */
-  id?: string;
-  /**
-   * Set the left side bar
-   */
-  left?: LayoutStackChildren;
-  /**
-   * Set the center view
-   */
-  center?: Layout;
-  /**
-   * Set the right side bar
-   */
-  right?: LayoutStackChildren;
-}
-
-export interface LayoutSplitView {
-  /**
-   * Set ID of the stack so you can use Navigation.mergeOptions to
-   * update options
-   */
-  id?: string;
-  /**
-   * Set master layout (the smaller screen, sidebar)
-   */
-  master: Layout;
-  /**
-   * Set detail layout (the larger screen, flexes)
-   */
-  detail: Layout;
-  /**
-   * Configure split view
-   */
-  options?: OptionsSplitView;
-}
-
-export interface LayoutRoot {
-  /**
-   * Set the root
-   */
-  root: Layout;
-  modals?: any;
-  overlays?: any;
-}
-
-export interface Layout {
-  /**
-   * Set the component
-   */
-  component?: LayoutComponent;
-  /**
-   * Set the stack
-   */
-  stack?: LayoutStack;
-  /**
-   * Set the bottom tabs
-   */
-  bottomTabs?: LayoutBottomTabs;
-  /**
-   * Set the side menu
-   */
-  sideMenu?: LayoutSideMenu;
-  /**
-   * Set the split view
-   */
-  splitView?: LayoutSplitView;
-}