diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js index c1cdb633b190b8..b50f8d1b9b2391 100644 --- a/packages/block-editor/src/components/index.native.js +++ b/packages/block-editor/src/components/index.native.js @@ -20,7 +20,3 @@ export { default as DefaultBlockAppender } from './default-block-appender'; // State Related Components export { default as BlockEditorProvider } from './provider'; - -// Mobile Editor Related Components -export { default as BottomSheet } from './mobile/bottom-sheet'; -export { default as Picker } from './mobile/picker'; diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js index 8f2aa785d3f341..d42fc59b3f3ba6 100644 --- a/packages/block-library/src/image/edit.native.js +++ b/packages/block-library/src/image/edit.native.js @@ -29,9 +29,11 @@ import { RichText, BlockControls, InspectorControls, +} from '@wordpress/block-editor'; +import { BottomSheet, Picker, -} from '@wordpress/block-editor'; +} from '@wordpress-mobile/components'; import { __, sprintf } from '@wordpress/i18n'; import { isURL } from '@wordpress/url'; import { doAction, hasAction } from '@wordpress/hooks'; diff --git a/packages/format-library/src/link/modal.native.js b/packages/format-library/src/link/modal.native.js index 57bc01b9f28ef2..5fd5547484eae6 100644 --- a/packages/format-library/src/link/modal.native.js +++ b/packages/format-library/src/link/modal.native.js @@ -9,7 +9,7 @@ import { Switch, Platform } from 'react-native'; */ import { __ } from '@wordpress/i18n'; import { Component } from '@wordpress/element'; -import { BottomSheet } from '@wordpress/block-editor'; +import { BottomSheet } from '@wordpress-mobile/components'; import { prependHTTP } from '@wordpress/url'; import { withSpokenMessages, diff --git a/packages/mobile/components/.npmrc b/packages/mobile/components/.npmrc new file mode 100644 index 00000000000000..43c97e719a5a82 --- /dev/null +++ b/packages/mobile/components/.npmrc @@ -0,0 +1 @@ +package-lock=false diff --git a/packages/mobile/components/CHANGELOG.md b/packages/mobile/components/CHANGELOG.md new file mode 100644 index 00000000000000..a197d191a4461b --- /dev/null +++ b/packages/mobile/components/CHANGELOG.md @@ -0,0 +1,3 @@ +## 1.0.0 (Unreleased) + +- Initial release: BottomSheet and Picker components diff --git a/packages/mobile/components/README.md b/packages/mobile/components/README.md new file mode 100644 index 00000000000000..3e1b02aa59801d --- /dev/null +++ b/packages/mobile/components/README.md @@ -0,0 +1,11 @@ +# Components + +This packages includes a library of React Native components to be used for creating common UI elements in the WordPress mobile apps. + +## Installation + +Install the module + +```bash +npm install @wordpress-mobile/components --save +``` diff --git a/packages/mobile/components/package.json b/packages/mobile/components/package.json new file mode 100644 index 00000000000000..e9423041cee88e --- /dev/null +++ b/packages/mobile/components/package.json @@ -0,0 +1,24 @@ +{ + "name": "@wordpress-mobile/components", + "version": "1.0.0", + "description": "React Native components for WordPress mobile apps", + "repository": "git+https://github.com/WordPress/gutenberg.git", + "author": "The WordPress Contributors", + "license": "GPL-2.0-or-later", + "keywords": [ + "wordpress", + "mobile", + "react-native" + ], + "main": "src/index", + "react-native": "src/index", + "dependencies": { + "@wordpress/components": "file:../components", + "@wordpress/element": "file:../element", + "@wordpress/i18n": "file:../i18n", + "react": "16.8.3", + "react-native": "^0.59.3", + "react-native-modal": "^6.5.0", + "react-native-safe-area": "^0.5.0" + } +} diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/button.native.js b/packages/mobile/components/src/bottom-sheet/button.js similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/button.native.js rename to packages/mobile/components/src/bottom-sheet/button.js diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/cell.native.js b/packages/mobile/components/src/bottom-sheet/cell.js similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/cell.native.js rename to packages/mobile/components/src/bottom-sheet/cell.js diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/cellStyles.android.scss b/packages/mobile/components/src/bottom-sheet/cellStyles.android.scss similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/cellStyles.android.scss rename to packages/mobile/components/src/bottom-sheet/cellStyles.android.scss diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/cellStyles.ios.scss b/packages/mobile/components/src/bottom-sheet/cellStyles.ios.scss similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/cellStyles.ios.scss rename to packages/mobile/components/src/bottom-sheet/cellStyles.ios.scss diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/index.native.js b/packages/mobile/components/src/bottom-sheet/index.js similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/index.native.js rename to packages/mobile/components/src/bottom-sheet/index.js diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/keyboard-avoiding-view.native.js b/packages/mobile/components/src/bottom-sheet/keyboard-avoiding-view.js similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/keyboard-avoiding-view.native.js rename to packages/mobile/components/src/bottom-sheet/keyboard-avoiding-view.js diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/picker-cell.native.js b/packages/mobile/components/src/bottom-sheet/picker-cell.js similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/picker-cell.native.js rename to packages/mobile/components/src/bottom-sheet/picker-cell.js diff --git a/packages/block-editor/src/components/mobile/bottom-sheet/styles.native.scss b/packages/mobile/components/src/bottom-sheet/styles.native.scss similarity index 100% rename from packages/block-editor/src/components/mobile/bottom-sheet/styles.native.scss rename to packages/mobile/components/src/bottom-sheet/styles.native.scss diff --git a/packages/mobile/components/src/index.js b/packages/mobile/components/src/index.js new file mode 100644 index 00000000000000..fe368976d20648 --- /dev/null +++ b/packages/mobile/components/src/index.js @@ -0,0 +1,6 @@ +/** + * Internal dependencies + */ + +export BottomSheet from './bottom-sheet'; +export Picker from './picker'; diff --git a/packages/block-editor/src/components/mobile/picker/index.android.js b/packages/mobile/components/src/picker/index.android.js similarity index 94% rename from packages/block-editor/src/components/mobile/picker/index.android.js rename to packages/mobile/components/src/picker/index.android.js index 50f264adaa55d7..3fad1cc2b23bf0 100644 --- a/packages/block-editor/src/components/mobile/picker/index.android.js +++ b/packages/mobile/components/src/picker/index.android.js @@ -9,7 +9,11 @@ import { View } from 'react-native'; */ import { __ } from '@wordpress/i18n'; import { Component } from '@wordpress/element'; -import { BottomSheet } from '@wordpress/block-editor'; + +/** + * Internal dependencies + */ +import BottomSheet from '../bottom-sheet'; export default class Picker extends Component { constructor() { diff --git a/packages/block-editor/src/components/mobile/picker/index.ios.js b/packages/mobile/components/src/picker/index.ios.js similarity index 100% rename from packages/block-editor/src/components/mobile/picker/index.ios.js rename to packages/mobile/components/src/picker/index.ios.js