Moved files

gosha212 · gosha212 · commit 0c78fdb8b3b5 · 2025-11-11T23:15:24.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -220,13 +220,13 @@ android/app/libs
 android/keystores/debug.keystore
 AndroidE2E/.project
 AndroidE2E/app/.project
-lib/android/.project
+android/.project
 playground/android/.project
 AndroidE2E/app/.classpath
 AndroidE2E/app/.settings/
 AndroidE2E/app/bin/
-lib/android/.settings/
-lib/android/app/.settings/
+android/.settings/
+android/app/.settings/
 playground/android/.settings/
 playground/android/app/.settings/
 AndroidE2E/.settings/
diff --git a/Mock.ts b/Mock.ts
@@ -1 +1 @@
-export * from './lib/Mock';
+export * from './Mock';
diff --git a/Mock/Components/ComponentScreen.tsx b/Mock/Components/ComponentScreen.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { View, Text, TouchableOpacity, Image, ImageURISource } from 'react-native';
-import { Navigation, ImageResource } from 'react-native-navigation';
+import { Navigation, ImageResource } from 'src';
 import { ComponentProps } from '../ComponentProps';
 import { VISIBLE_SCREEN_TEST_ID } from '../constants';
 import { LayoutStore } from '../Stores/LayoutStore';
diff --git a/Mock/Components/NavigationButton.tsx b/Mock/Components/NavigationButton.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Button, TouchableOpacity } from 'react-native';
-import { Navigation, OptionsTopBarButton } from 'react-native-navigation';
+import { Navigation, OptionsTopBarButton } from 'src';
 import { events } from '../Stores/EventsStore';
 
 interface ButtonProps {
diff --git a/Mock/Components/TopBar.tsx b/Mock/Components/TopBar.tsx
@@ -5,7 +5,7 @@ import {
   OptionsTopBar,
   OptionsTopBarBackButton,
   OptionsTopBarButton,
-} from 'react-native-navigation';
+} from 'src';
 import ParentNode from '../Layouts/ParentNode';
 import { LayoutStore } from '../Stores/LayoutStore';
 import { NavigationButton } from './NavigationButton';
diff --git a/Mock/Layouts/BottomTabsNode.ts b/Mock/Layouts/BottomTabsNode.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import { switchTabByIndex } from '../actions/layoutActions';
 import ParentNode from './ParentNode';
 
diff --git a/Mock/Layouts/Node.ts b/Mock/Layouts/Node.ts
@@ -1,4 +1,4 @@
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import ParentNode from './ParentNode';
 
 interface Data {
diff --git a/Mock/Layouts/ParentNode.ts b/Mock/Layouts/ParentNode.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { OptionsTopBarButton } from '../../src/interfaces/Options';
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import { LayoutStore } from '../Stores/LayoutStore';
 import ComponentNode from './ComponentNode';
 import LayoutNodeFactory from './LayoutNodeFactory';
diff --git a/Mock/Layouts/SideMenu.ts b/Mock/Layouts/SideMenu.ts
@@ -1,6 +1,6 @@
 import ParentNode from './ParentNode';
 import ComponentNode from './ComponentNode';
-import { Options } from '../../src/index';
+import { Options } from '../../src';
 import * as layoutActions from '../actions/layoutActions';
 import { NodeType } from './Node';
 
diff --git a/Mock/Stores/EventsStore.ts b/Mock/Stores/EventsStore.ts
@@ -4,7 +4,7 @@ import {
   ModalDismissedEvent,
   ScreenPoppedEvent,
 } from '../../src/interfaces/ComponentEvents';
-import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src/index';
+import { ComponentDidAppearEvent, NavigationButtonPressedEvent } from '../../src';
 import { BottomTabPressedEvent, CommandCompletedEvent } from '../../src/interfaces/Events';
 
 export const events = {
diff --git a/Mock/index.ts b/Mock/index.ts
@@ -6,7 +6,7 @@ export function mockNativeComponents() {
   const { NativeCommandsSender } = require('./mocks/NativeCommandsSender');
   const { NativeEventsReceiver } = require('./mocks/NativeEventsReceiver');
   const { AppRegistryService } = require('./mocks/AppRegistryService');
-  const { Navigation } = require('react-native-navigation');
+  const { Navigation } = require('src');
 
   Navigation.mockNativeComponents(
     new NativeCommandsSender(),
diff --git a/Mock/mocks/NativeEventsReceiver.ts b/Mock/mocks/NativeEventsReceiver.ts
@@ -18,7 +18,7 @@ import {
   BottomTabLongPressedEvent,
   BottomTabPressedEvent,
 } from '../../src/interfaces/Events';
-import { events } from './../Stores/EventsStore';
+import { events } from '../Stores/EventsStore';
 
 export class NativeEventsReceiver {
   public registerAppLaunchedListener(callback: () => void): EmitterSubscription {
diff --git a/integration/redux/Redux.test.js b/integration/redux/Redux.test.js
@@ -2,7 +2,7 @@ const React = require('react');
 require('react-native');
 const { render, act } = require('@testing-library/react-native');
 const { Provider } = require('react-redux');
-const { Navigation } = require('../../lib/src/index');
+const { Navigation } = require('../../src/index');
 
 describe('redux support', () => {
   let MyConnectedComponent;
diff --git a/integration/remx/remx.test.js b/integration/remx/remx.test.js
@@ -1,7 +1,7 @@
 const React = require('react');
 require('react-native');
 const { render, act } = require('@testing-library/react-native');
-const { Navigation } = require('../../lib/src/index');
+const { Navigation } = require('../../src/index');
 
 describe('remx support', () => {
   let MyConnectedComponent;
diff --git a/src/commands/Commands.test.ts b/src/commands/Commands.test.ts
@@ -17,7 +17,7 @@ import { LayoutProcessorsStore } from '../processors/LayoutProcessorsStore';
 import { CommandName } from '../interfaces/CommandName';
 import { OptionsCrawler } from './OptionsCrawler';
 import React from 'react';
-import { IWrappedComponent } from 'react-native-navigation/components/ComponentWrapper';
+import { IWrappedComponent } from 'src/components/ComponentWrapper';
 
 describe('Commands', () => {
   let uut: Commands;
diff --git a/src/commands/OptionsCrawler.ts b/src/commands/OptionsCrawler.ts
@@ -12,7 +12,7 @@ import {
   LayoutStack,
   LayoutTopTabs,
 } from '../interfaces/Layout';
-import { UniqueIdProvider } from 'react-native-navigation/adapters/UniqueIdProvider';
+import { UniqueIdProvider } from 'src/adapters/UniqueIdProvider';
 import { LayoutType } from './LayoutType';
 
 type ComponentWithOptions = ComponentType<any> & { options(passProps: any): Options };
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect, useRef } from 'react';
 import { requireNativeComponent, View, ViewProps, StyleSheet, Dimensions } from 'react-native';
-import { AnimationOptions, ViewAnimationOptions } from 'react-native-navigation/interfaces/Options';
+import { AnimationOptions, ViewAnimationOptions } from 'src/interfaces/Options';
 
 export interface RNNModalProps extends ViewProps {
   visible: boolean;
diff --git a/src/processors/LayoutProcessor.test.ts b/src/processors/LayoutProcessor.test.ts
@@ -1,5 +1,5 @@
 import { LayoutProcessor } from './LayoutProcessor';
-import { LayoutProcessorsStore } from '../processors/LayoutProcessorsStore';
+import { LayoutProcessorsStore } from './LayoutProcessorsStore';
 import { CommandName } from '../interfaces/CommandName';
 
 describe('Layout processor', () => {
diff --git a/tsconfig.json b/tsconfig.json
@@ -16,5 +16,8 @@
       "react-native-navigation/*": ["lib/src/*"]
     }
   },
-  "include": ["./lib/src/**/*", "./playground/**/*", "lib/Mock"]
+  "include": [
+    "./src/**/*", "./playground/**/*",
+    "Mock"
+  ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from './lib/Mock';`
	`1`	`+export * from './Mock';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Options } from '../../src/index';`
	`1`	`+import { Options } from '../../src';`
`2`	`2`	`import ParentNode from './ParentNode';`
`3`	`3`
`4`	`4`	`interface Data {`