diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 1bd16983c7..0000000000 --- a/gulpfile.js +++ /dev/null @@ -1,130 +0,0 @@ -const gulp = require('gulp') -const sass = require('gulp-sass')(require('sass')) -const postcss = require('gulp-postcss') -const rename = require('gulp-rename') -const cssvariables = require('postcss-css-variables') -const insert = require('gulp-insert') -const config = require('./src/config.json') - -const adaptedNameArray = [] -// eslint-disable-next-line array-callback-return -config.nav.map((item) => { - item.packages.forEach((element) => { - const { name, version, dd } = element - if (!dd) return // 未适配不导出 - adaptedNameArray.push(name.toLowerCase()) - }) -}) -const argvs = process.argv.splice(4)[0]?.split('/') || adaptedNameArray -console.log(argvs, 'argvs') -// 监视频率 https://www.martin-brennan.com/gulp-watch-high-cpu-usage/ -const interval = { interval: 500 } -// 监视文件变化 -gulp.task('watch', () => { - argvs.forEach((argv) => { - gulp.watch( - `src/packages/${argv}/demos/taro/*`, - interval, - gulp.series(`${argv}copyDemo`) - ) - gulp.watch( - `src/packages/${argv}/*.scss`, - interval, - gulp.series(`${argv}sass`, `${argv}copyCss`) - ) - gulp.watch( - `src/packages/${argv}/demo.taro.tsx`, - interval, - gulp.series(`${argv}copyTaroDemo`) - ) - gulp.watch( - `src/packages/${argv}/${argv}.taro.tsx`, - interval, - gulp.series(`${argv}copyTaro`) - ) - // gulp.watch( - // `src/packages/${argv}/${argv}.rn.tsx`, - // interval, - // gulp.series(`${argv}copyRN`) - // ) - }) - const watchTasks = [] - // eslint-disable-next-line array-callback-return - argvs.map((argv) => { - watchTasks.push(...[`${argv}sass`, `${argv}copyCss`]) - }) - gulp.watch( - [ - `src/styles/variables.scss`, - 'src/styles/mixins/text-ellipsis.scss', - 'src/styles/theme-default.scss', - ], - interval, - gulp.series(watchTasks) - ) -}) -argvs.forEach((argv) => { - const targetBaseUrl = `${process.cwd()}/packages/nutui-taro-demo/nutui-react/packages/${argv}` - gulp.task(`${argv}copyDemo`, (path) => { - console.log(path, 'path') - return gulp - .src(`src/packages/${argv}/demos/taro/*`) - .pipe(gulp.dest(`${targetBaseUrl}/demos/taro/`)) - }) - - gulp.task(`${argv}sass`, () => { - return gulp - .src([`src/packages/${argv}/${argv}.scss`]) - .pipe( - insert.prepend( - `@import '../../styles/theme-default.scss';\n@import '../../styles/mixins/text-ellipsis.scss';\n@import '../../styles/variables.scss';\n` - ) - ) - .pipe( - sass({ - // 导入全局变量文件，不好用 - // includePaths: [ - // 'src/styles/theme-default.scss', - // 'src/styles/mixins/text-ellipsis.scss', - // 'src/styles/variables.scss', - // ], - }).on('error', sass.logError) - ) - .pipe(postcss([cssvariables()])) - .pipe( - rename(function (path) { - path.extname = '.harmony.css' - }) - ) - .pipe(gulp.dest(`src/packages/${argv}/`)) - }) - - gulp.task(`${argv}copyCss`, () => { - return gulp - .src([ - `src/packages/${argv}/*.scss`, - `src/packages/${argv}/*.harmony.css`, - ]) - .pipe(gulp.dest(`${targetBaseUrl}/`)) - }) - - gulp.task(`${argv}copyTaroDemo`, () => { - return gulp - .src(`src/packages/${argv}/demo.taro.tsx`) - .pipe(insert.prepend(`import '../../../styles/demo.scss';\n`)) - .pipe(gulp.dest(`${targetBaseUrl}/`)) - }) - - gulp.task(`${argv}copyTaro`, () => { - return gulp - .src(`src/packages/${argv}/${argv}.taro.tsx`) - .pipe(insert.prepend(`import "./${argv}.harmony.css";\n`)) - .pipe(gulp.dest(`${targetBaseUrl}/`)) - }) - // gulp.task(`${argv}copyRN`, () => { - // return gulp - // .src(`src/packages/${argv}/${argv}.rn.tsx`) - // .pipe(insert.prepend(`import "./${argv}.harmony.css";\n`)) - // .pipe(gulp.dest(`${targetBaseUrl}/`)) - // }) -}) diff --git a/package.json b/package.json index 4ffa1bb355..bb1c440a14 100644 --- a/package.json +++ b/package.json @@ -51,11 +51,9 @@ "checked:taro": "npm run generate:file:taro && tsc --project ./tsconfig.taro.json --noEmit", "changelog": "node ./scripts/generate-changelog.js", "clone:jdharmony": "node ./scripts/harmony/clone-jdharmony.js", - "clone:rn": "pnpm run update:taro:entry && node ./scripts/rn/copy-file.js", "dev": "vite --open --force", "dev:rtl": "VITE_RTL=rtl vite --open --force", "dev:jrkf": "VITE_APP_PROJECT_ID=jrkf vite --open --force", - "dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn", "dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn", "dev:taro": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev", "dev:taro:h5": "pnpm dev:taro h5", @@ -93,7 +91,7 @@ "e2e:open:h5": "start-server-and-test dev http://localhost:5173/ cypress:open", "e2e:run:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:run:taro", "e2e:open:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:open:taro", - "update:taro:entry": "node ./scripts/rn/update-taro-entry", + "update:taro:entry": "node ./scripts/harmony/update-taro-entry", "upgradeTaro": "pnpm --dir ./packages/nutui-taro-demo upgradeTaro" }, "lint-staged": { diff --git a/packages/nutui-taro-demo/babel.config.js b/packages/nutui-taro-demo/babel.config.js index 822f7dcd66..bbf24e5f13 100644 --- a/packages/nutui-taro-demo/babel.config.js +++ b/packages/nutui-taro-demo/babel.config.js @@ -14,10 +14,7 @@ module.exports = { ], ], plugins: [ - !(process.env.TARO_ENV === 'rn' || process.env.TARO_ENV === 'jdrn') && [ - '@babel/plugin-transform-typescript', - { allowDeclareFields: true }, - ], + ['@babel/plugin-transform-typescript', { allowDeclareFields: true }], projectID === 'jmapp' && [ replaceIcons({ sourceLibrary: ['@nutui/icons-react-taro', '@nutui/icons-react'], diff --git a/packages/nutui-taro-demo/config/index.js b/packages/nutui-taro-demo/config/index.js index 7e7dcea81e..e0c8379093 100644 --- a/packages/nutui-taro-demo/config/index.js +++ b/packages/nutui-taro-demo/config/index.js @@ -10,9 +10,7 @@ if (projectID) { themeStr = `src/styles/theme-${projectID}.scss` } -let plugins = !['harmony', 'jdharmony', 'rn', 'jdrn'].includes( - process.env.TARO_ENV -) +let plugins = !['harmony', 'jdharmony'].includes(process.env.TARO_ENV) ? ['@tarojs/plugin-html'] : [] @@ -20,10 +18,6 @@ if (process.env.TARO_ENV === 'harmony') { plugins.push('@tarojs/plugin-platform-harmony-ets') } -if ((process.env.TARO_ENV === 'rn' || process.env.TARO_ENV === 'jdrn') && JD) { - plugins.push('@jdtaro/plugin-platform-jdrn') -} - // 小程序、jd H5 通过此插件覆盖 if ( (process.env.TARO_ENV === 'weapp' || @@ -255,21 +249,6 @@ const config = { }, }, }, - rn: { - appName: 'JDReactAPIDemos', - postcss: { - 'postcss-css-variables': { - enable: true, - config: { - // variables: { - // '--nutui-color-primary': '#000', - // '--nutui-color-primary-stop-1': '#000', - // '--nutui-color-primary-stop-2': '#000', - // }, - }, - }, - }, - }, isWatch: true, } diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json index eafa1f4cd4..6799f62743 100644 --- a/packages/nutui-taro-demo/package.json +++ b/packages/nutui-taro-demo/package.json @@ -37,7 +37,6 @@ "dev:jdharmony": "pnpm exec taro build native-components --type jdharmony", "dev:jdharmonycpp": "pnpm exec taro build native-components --type jdharmony_cpp", "dev:jdhybrid": "npm run build:jdhybrid -- --watch", - "dev:jdrn": "node ./scripts/taro/generate-nutui-taro.js && taro build --type jdrn --watch --reset-cache", "dev:quickapp": "npm run build:quickapp -- --watch", "dev:weapp:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:weapp -- --watch ", "dev:swan:jmapp": "VITE_APP_PROJECT_ID=jmapp npm run build:swan -- --watch", @@ -59,7 +58,6 @@ "dependencies": { "@babel/runtime": "^7.23.9", "@dongdesign/inject-jd-platform-styles": "1.0.4", - "@jdreact/jdreact-jsbundle-commonpack": "1.0.425", "@jdtaro/plugin-platform-jdhybrid": "0.2.1", "@jdtaro/taro-platform-jdharmony": "2.0.70", "@jdtaro/plugin-platform-jdharmony-cpp": "0.1.4-alpha.3", diff --git a/packages/nutui-taro-demo/scripts/taro/generate-nutui-taro.js b/packages/nutui-taro-demo/scripts/taro/generate-nutui-taro.js deleted file mode 100644 index c76f7c5a73..0000000000 --- a/packages/nutui-taro-demo/scripts/taro/generate-nutui-taro.js +++ /dev/null @@ -1,82 +0,0 @@ -// generate nutui.react.ts file for dev or build -const config = require('../../nutui-react/config.json') -var glob = require('glob') -const path = require('path') -const fs = require('fs-extra') -let importStr = `` -let importRNStr = `` -let importMarkdownStr = `` -let importScssStr = `\n` -const packages = [] -const mds = [] -const raws = [] - -config.nav.map((item) => { - item.packages.forEach((element) => { - let { name, show, type, taro, exportEmpty, exclude, version, rn, dd } = element - if (exclude) return - if (!dd) return - - importStr += `import ${name} from '@/packages/${name.toLowerCase()}/index.taro'\n` - importStr += `export * from '@/packages/${name.toLowerCase()}/index.taro'\n` - importRNStr += `import ${name} from '@/packages/${name.toLowerCase()}/index.${rn?'rn':'taro'}'\n` - importRNStr += `export * from '@/packages/${name.toLowerCase()}/index.${rn?'rn':'taro'}'\n` - importScssStr += `import '@/packages/${name.toLowerCase()}/${name.toLowerCase()}.harmony.css'\n` - packages.push(name) - - glob - .sync( - path.join(__dirname, `../../nutui-react/packages/${name.toLowerCase()}/`) + - '*.md' - ) - .map((f) => { - let lang = 'zh-CN' - let matched = f.match(/doc\.([a-z-]+)\.md/i) - if (matched) { - ;[, lang] = matched - const langComponentName = `${name}${lang.replace('-', '')}` - importMarkdownStr += `import ${langComponentName} from '@/packages/${name.toLowerCase()}/doc.${lang}.md?raw';\n` - raws.push(langComponentName) - } - }) - importMarkdownStr += `import ${name} from '@/packages/${name.toLowerCase()}/doc.md?raw'\n` - mds.push(name) - raws.push(name) - }) -}) - -let fileStr = `${importStr} -${importScssStr} -export { ${packages.join(',')} };` -fs.outputFile( - path.resolve(__dirname, '../../nutui-react/packages/nutui.react.taro.ts'), - fileStr, - 'utf8', - (error) => { - if (error) throw error - } -) - -// let fileRNStr = `${importRNStr} -// ${importScssStr} -// export { ${packages.join(',')} };` -// fs.outputFile( -// path.resolve(__dirname, '../../nutui-react/packages/nutui.react.rn.ts'), -// fileRNStr, -// 'utf8', -// (error) => { -// if (error) throw error -// } -// ) -// -let taroScssfileStr = ` -${importScssStr} -export default { "NutUI":"NutUI-Taro" };` -fs.outputFile( - path.resolve(__dirname, '../../nutui-react/packages/nutui.react.scss.taro.ts'), - taroScssfileStr, - 'utf8', - (error) => { - if (error) throw error - } -) diff --git a/packages/nutui-taro-demo/src/app.ts b/packages/nutui-taro-demo/src/app.ts index b56f826dc8..9a9ff37670 100644 --- a/packages/nutui-taro-demo/src/app.ts +++ b/packages/nutui-taro-demo/src/app.ts @@ -1,12 +1,10 @@ import { Component } from 'react' -import Taro from '@tarojs/taro' import './app.scss' -if (Taro.getEnv() !== 'RN') { - import('@/sites/assets/styles/reset.scss'); - import('@/packages/nutui.react.scss.taro'); - import('@nutui/touch-emulator'); -} +import('@/sites/assets/styles/reset.scss') +import('@/packages/nutui.react.scss.taro') +import('@nutui/touch-emulator') + // console.log(NutUI) class App extends Component { render() { diff --git a/scripts/rn/update-taro-entry.js b/scripts/harmony/update-taro-entry.js similarity index 100% rename from scripts/rn/update-taro-entry.js rename to scripts/harmony/update-taro-entry.js diff --git a/scripts/rn/copy-file.js b/scripts/rn/copy-file.js deleted file mode 100644 index ff10d4ab07..0000000000 --- a/scripts/rn/copy-file.js +++ /dev/null @@ -1,89 +0,0 @@ -/** - * RN 自动化适配脚本 - */ -const fse = require('fs-extra') -const config = require('../../src/config.json') -const args = process.argv.splice(2) - -console.log('rn copy-file.js args', args) - -// 已适配组件对象 -const adaptedArray = [] -config.nav.map((item) => { - item.packages.forEach((element) => { - const { name, version,dd } = element - if (!dd) return // 未适配不导出 - adaptedArray.push({ - ...element, - lowercaseName: element.name.toLowerCase(), - enName: item.enName, - }) - }) -}) -// 子组件 -const childAdaptedArray = [ - 'cellgroup', - 'row', - 'col', - 'griditem', - 'swiperitem', - 'hoverbuttonitem', - 'avatargroup', - 'icon', - 'tabpane', -] - -// copy文件并增加css引入 -const targetBaseUrl = `${process.cwd()}/packages/nutui-taro-demo/nutui-react` -const targetwrapUrl = `${process.cwd()}/src` - -const copyFile = async (from, to, success, isSingle = false) => { - fse.copy(from, to, function (err) { - if (err) { - console.error('An error occurred while copying the directory.', err) - return - } - console.log(`${success}!>`, to) - - adaptedArray.map((item) => { - if (item.lowercaseName) { - if (!childAdaptedArray.includes(item.lowercaseName)) { - modify( - `${targetBaseUrl}/packages/${item.lowercaseName}/demo.taro.tsx`, - `import '../../../styles/demo.scss';\n` - ) - } - if (!['icon'].includes(item)) { - modify( - `${targetBaseUrl}/packages/${item.lowercaseName}/${item.lowercaseName}.taro.tsx`, - `import "./${item.lowercaseName}.scss";\n` - ) - } - } - }) - }) -} - -const removeFile = async (url) => { - fse.remove(url, (err) => { - if (err) { - throw err - } - console.log(`全部移除成功!>`, url) - copyFile(`${targetwrapUrl}`, `${targetBaseUrl}`, '全部拷贝完成') - }) -} - -const modify = (fileUrl, importStatement) => { - fse.readFile(fileUrl, 'utf8').then((content) => { - let modifiedContent = content - modifiedContent = [importStatement, modifiedContent.slice(0)].join('') - return fse.writeFile(fileUrl, modifiedContent, 'utf8') - }) -} - -const copy = async () => { - await removeFile(`${targetBaseUrl}`) -} - -copy() diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx index 872c6c2dc0..723a7a0003 100644 --- a/src/packages/avatar/avatar.taro.tsx +++ b/src/packages/avatar/avatar.taro.tsx @@ -12,7 +12,7 @@ import { User } from '@nutui/icons-react-taro' import { AvatarContext } from '@/packages/avatargroup/context' // import Image from '@/packages/image/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' import AvatarGroup from '@/packages/avatargroup/index.taro' import pxTransform from '@/utils/px-transform' @@ -33,7 +33,7 @@ export type AvatarShape = 'round' | 'square' const defaultProps = { ...ComponentDefaults, - size: harmonyAndRn() ? '40' : '', + size: harmony() ? '40' : '', shape: 'round', icon: '', background: '#eee', @@ -94,7 +94,7 @@ export const Avatar: FunctionComponent< height: sizeValue.indexOf(size) > -1 ? '' : pxTransform(parseInt(size)), backgroundColor: `${background}`, color, - [harmonyAndRn() ? 'marginRight' : 'marginLeft']: + [harmony() ? 'marginRight' : 'marginLeft']: avatarIndex !== 1 && propAvatarGroup?.gap ? `${propAvatarGroup?.gap}px` : '', diff --git a/src/packages/avatar/demos/taro/demo4.tsx b/src/packages/avatar/demos/taro/demo4.tsx index 200ed1879c..eca54d257c 100644 --- a/src/packages/avatar/demos/taro/demo4.tsx +++ b/src/packages/avatar/demos/taro/demo4.tsx @@ -1,19 +1,19 @@ import React from 'react' import { Avatar, Cell } from '@nutui/nutui-react-taro' import { User } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo4 = () => { return ( } /> U diff --git a/src/packages/avatar/demos/taro/demo5.tsx b/src/packages/avatar/demos/taro/demo5.tsx index ea7d8ee9e2..3568f321f4 100644 --- a/src/packages/avatar/demos/taro/demo5.tsx +++ b/src/packages/avatar/demos/taro/demo5.tsx @@ -2,12 +2,12 @@ import React from 'react' // import { Avatar, Badge, Cell } from '@nutui/nutui-react-taro' import { Avatar, Cell } from '@nutui/nutui-react-taro' import { User } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo5 = () => { return ( - {harmonyAndRn() ? null : ( + {harmony() ? null : ( <> {/* */} } shape="square" /> diff --git a/src/packages/avatar/demos/taro/demo6.tsx b/src/packages/avatar/demos/taro/demo6.tsx index 40c64b0b01..3465d0f477 100644 --- a/src/packages/avatar/demos/taro/demo6.tsx +++ b/src/packages/avatar/demos/taro/demo6.tsx @@ -1,7 +1,7 @@ import React from 'react' import { Avatar, Cell } from '@nutui/nutui-react-taro' import { User } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo6 = () => { return ( @@ -11,8 +11,8 @@ const Demo6 = () => { } /> U @@ -23,8 +23,8 @@ const Demo6 = () => { } /> U diff --git a/src/packages/avatar/demos/taro/demo7.tsx b/src/packages/avatar/demos/taro/demo7.tsx index bcc5697ce7..8348be66ee 100644 --- a/src/packages/avatar/demos/taro/demo7.tsx +++ b/src/packages/avatar/demos/taro/demo7.tsx @@ -1,7 +1,7 @@ import React from 'react' import { Avatar, Cell } from '@nutui/nutui-react-taro' import { User } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo7 = () => { return ( @@ -10,8 +10,8 @@ const Demo7 = () => { } /> U diff --git a/src/packages/backtop/backtop.scss b/src/packages/backtop/backtop.scss index e65f50644a..faade92425 100644 --- a/src/packages/backtop/backtop.scss +++ b/src/packages/backtop/backtop.scss @@ -4,10 +4,6 @@ .nut-backtop { display: none; - &-rn { - position: absolute; - } - &-show { display: flex; align-items: center; diff --git a/src/packages/backtop/backtop.taro.tsx b/src/packages/backtop/backtop.taro.tsx index 6caea1359f..352d7e2c7f 100644 --- a/src/packages/backtop/backtop.taro.tsx +++ b/src/packages/backtop/backtop.taro.tsx @@ -19,7 +19,6 @@ import { ComponentDefaults } from '@/utils/typings' import HoverButton, { HoverButtonProps, } from '@/packages/hoverbutton/index.taro' -import { rn } from '@/utils/platform-taro' export interface BackTopProps extends HoverButtonProps { threshold: number @@ -62,7 +61,6 @@ export const BackTop: FunctionComponent< classPrefix, { [`${classPrefix}-show`]: backTop, - [`${classPrefix}-rn`]: rn(), }, className ) diff --git a/src/packages/backtop/doc.en-US.md b/src/packages/backtop/doc.en-US.md index e01c20ea75..d0e145fd43 100644 --- a/src/packages/backtop/doc.en-US.md +++ b/src/packages/backtop/doc.en-US.md @@ -50,7 +50,7 @@ import { BackTop } from '@nutui/nutui-react' ::: -### RN, HarmonyOS version usage +### HarmonyOS version usage Due to the lack of support for fixed positioning, it needs to be used in conjunction with ScrollView. @@ -70,7 +70,7 @@ Due to the lack of support for fixed positioning, it needs to be used in conjunc | threshold | How high to scroll the page vertically | `number` | `200` | | zIndex | Set the component z-index | `number` | `900` | | duration | Set animation duration | `number` | `1000` | -| scrollRes | Callback parameters of a ScrollView listener, mainly used for RN and HarmonyOS | `PageScrollObejct` | `-` | +| scrollRes | Callback parameters of a ScrollView listener, mainly used for HarmonyOS | `PageScrollObejct` | `-` | | onClick | Emitted when component is clicked | `(event: MouseEvent) => void` | `-` | ## Theming diff --git a/src/packages/backtop/doc.taro.md b/src/packages/backtop/doc.taro.md index becb8c2c18..dec6816459 100644 --- a/src/packages/backtop/doc.taro.md +++ b/src/packages/backtop/doc.taro.md @@ -42,7 +42,7 @@ import { BackTop } from '@nutui/nutui-react-taro' ::: -### RN、鸿蒙端使用 +### 鸿蒙端使用 由于不支持 fixed 定位，需配合 ScrollView 进行使用。 diff --git a/src/packages/backtop/doc.zh-TW.md b/src/packages/backtop/doc.zh-TW.md index e9fa13bd34..2ba44a46d8 100644 --- a/src/packages/backtop/doc.zh-TW.md +++ b/src/packages/backtop/doc.zh-TW.md @@ -50,7 +50,7 @@ import { BackTop } from '@nutui/nutui-react' ::: -### RN、鴻蒙端使用 +### 鴻蒙端使用 由於不支援固定定位，需配合 ScrollView 進行使用。 diff --git a/src/packages/button/button.scss b/src/packages/button/button.scss index 5792e1a66b..75b660a967 100644 --- a/src/packages/button/button.scss +++ b/src/packages/button/button.scss @@ -2,10 +2,10 @@ position: relative; display: flex; display: inline-block; - /* #ifdef rn harmony*/ + /* #ifdef harmony*/ width: 80px; /* #endif */ - /* #ifndef rn harmony*/ + /* #ifndef harmony*/ width: auto; /* #endif */ flex-direction: row; @@ -72,7 +72,7 @@ flex-direction: row; align-items: center; justify-content: center; - /* #ifndef rn harmony */ + /* #ifndef harmony */ background: initial; /* #endif */ .nut-icon { diff --git a/src/packages/button/button.taro.tsx b/src/packages/button/button.taro.tsx index 13a1b1e2ae..1eca6d9c61 100644 --- a/src/packages/button/button.taro.tsx +++ b/src/packages/button/button.taro.tsx @@ -9,7 +9,7 @@ import { import { Loading } from '@nutui/icons-react-taro' import { getEnv } from '@tarojs/taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' type OmitMiniProgramButtonProps = Omit< MiniProgramButtonProps, @@ -91,7 +91,7 @@ export const Button = React.forwardRef>( } } else { style.color = '#fff' - if (harmonyAndRn()) { + if (harmony()) { style.backgroundColor = color } style.background = color @@ -167,7 +167,7 @@ export const Button = React.forwardRef>( className={`nut-button-children nut-button-${size}-children nut-button-${type}-children ${!(props.fill || disabled || loading) ? '' : `nut-button-${type}${props.fill ? `-${fill}` : ''}${disabled || loading ? '-disabled' : ''}`}${icon || loading ? ` nut-button-text` : ''}${ rightIcon ? ' nut-button-text-right' : '' }`} - style={harmonyAndRn() ? getContStyle : {}} + style={harmony() ? getContStyle : {}} > {children} diff --git a/src/packages/button/demo.taro.tsx b/src/packages/button/demo.taro.tsx index 911e242327..2506dbc266 100644 --- a/src/packages/button/demo.taro.tsx +++ b/src/packages/button/demo.taro.tsx @@ -13,7 +13,7 @@ import Demo7 from './demos/taro/demo7' import Demo8 from './demos/taro/demo8' import Demo9 from './demos/taro/demo9' import Demo10 from './demos/taro/demo10' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const ButtonDemo = () => { const [translated] = useTranslate({ @@ -58,7 +58,7 @@ const ButtonDemo = () => { <>
- {!harmonyAndRn() ? ( + {!harmony() ? ( <> 设置 open-type diff --git a/src/packages/cell/demos/taro/demo6.tsx b/src/packages/cell/demos/taro/demo6.tsx index eed3a2ca01..55eb305923 100644 --- a/src/packages/cell/demos/taro/demo6.tsx +++ b/src/packages/cell/demos/taro/demo6.tsx @@ -4,7 +4,6 @@ import { navigateTo, redirectTo } from '@tarojs/taro' import { ArrowRight, User } from '@nutui/icons-react-taro' import { ITouchEvent, Text, View } from '@tarojs/components' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' const Demo6 = () => { const onJumpclick = ( @@ -23,7 +22,7 @@ const Demo6 = () => { className="nutui-cell-clickable" title="链接" align="center" - extra={harmonyAndRn() ? null : } + extra={} /> { /pages/index/index - {harmonyAndRn() ? null : } + } align="center" @@ -74,9 +73,7 @@ const Demo6 = () => { }} > More - {harmonyAndRn() ? null : ( - - )} + } /> @@ -113,11 +110,11 @@ const Demo6 = () => { flexDirection: 'row', }} > - {harmonyAndRn() ? null : } + 我是标题 } - extra={harmonyAndRn() ? null : } + extra={} /> 自定义内容 diff --git a/src/packages/col/col.scss b/src/packages/col/col.scss index abe350416b..19d6c503e0 100644 --- a/src/packages/col/col.scss +++ b/src/packages/col/col.scss @@ -22,7 +22,6 @@ } } -// RN 不支持 calc // dart-sass: math.div -> round & * @for $i from 1 through 24 { .nut-col-offset-#{$i} { diff --git a/src/packages/divider/demo.taro.tsx b/src/packages/divider/demo.taro.tsx index fe662ae926..bca64ef284 100644 --- a/src/packages/divider/demo.taro.tsx +++ b/src/packages/divider/demo.taro.tsx @@ -39,13 +39,8 @@ const DividerDemo = () => { {translated.contentPosition} - {/* RN unsupported dashed / dotted border style */} - {Taro.getEnv() !== 'RN' ? ( - <> - {translated.dashed} - - - ) : null} + {translated.dashed} + {translated.customStyle} {translated.verticalDivider} diff --git a/src/packages/divider/demos/taro/demo5.tsx b/src/packages/divider/demos/taro/demo5.tsx index 693a11e21b..75cb956edd 100644 --- a/src/packages/divider/demos/taro/demo5.tsx +++ b/src/packages/divider/demos/taro/demo5.tsx @@ -1,6 +1,5 @@ import React from 'react' import { Cell, Divider } from '@nutui/nutui-react-taro' -import { rn } from '@/utils/platform-taro' import pxTransform from '@/utils/px-transform' const Demo5 = () => { @@ -12,7 +11,7 @@ const Demo5 = () => { paddingLeft: pxTransform(16), paddingRight: pxTransform(16), borderColor: '#0073ff', - borderStyle: rn() ? 'solid' : 'dashed', + borderStyle: 'dashed', }} > 文本 diff --git a/src/packages/empty/demo.taro.tsx b/src/packages/empty/demo.taro.tsx index 5d247ed5d9..eaffb8054f 100644 --- a/src/packages/empty/demo.taro.tsx +++ b/src/packages/empty/demo.taro.tsx @@ -38,8 +38,6 @@ const EmptyDemo = () => { }, }) - const isRN = Taro.getEnv() === Taro.ENV_TYPE.RN - return ( <>
@@ -50,13 +48,8 @@ const EmptyDemo = () => { {translated.c38a08ef} - {/* TODO: Tabs 适配 */} - {!isRN && ( - <> - {translated.b840c88f} - - - )} + {translated.b840c88f} + {translated.a74a1fd4} {translated['8dab2f66']} diff --git a/src/packages/empty/empty.taro.tsx b/src/packages/empty/empty.taro.tsx index 3e12fc746b..05be245d28 100644 --- a/src/packages/empty/empty.taro.tsx +++ b/src/packages/empty/empty.taro.tsx @@ -1,7 +1,6 @@ import React, { FunctionComponent, useEffect, useState, ReactNode } from 'react' import classNames from 'classnames' import { View, Image } from '@tarojs/components' -import Taro from '@tarojs/taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { Button, @@ -89,12 +88,11 @@ export const Empty: FunctionComponent< ) useEffect(() => { - const isRN = Taro.getEnv() === Taro.ENV_TYPE.RN setImgStyle(() => { if (!imageSize) { return {} } - if (isRN || typeof imageSize !== 'number') { + if (typeof imageSize !== 'number') { return { width: imageSize, height: imageSize, diff --git a/src/packages/hoverbutton/demo.taro.tsx b/src/packages/hoverbutton/demo.taro.tsx index 71f9f29d29..d676f29000 100644 --- a/src/packages/hoverbutton/demo.taro.tsx +++ b/src/packages/hoverbutton/demo.taro.tsx @@ -9,10 +9,10 @@ import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' import Demo4 from './demos/taro/demo4' import Demo6 from './demos/taro/demo6' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' import Demo5 from './demos/taro/demo5' -const isNative = harmonyAndRn() +const isNative = harmony() const HoverDemo = () => { const [translated] = useTranslate({ @@ -85,7 +85,7 @@ const HoverDemo = () => { }} /> - {/* @TODO RN、鸿蒙端暂不支持 ConfigProvider */} + {/* @TODO 鸿蒙端暂不支持 ConfigProvider */} {translated.customSpacing} { return ( } tabbarHeight={48} /> - {harmonyAndRn() ? null : ( + {harmony() ? null : ( } /> } /> diff --git a/src/packages/hoverbutton/demos/taro/demo4.tsx b/src/packages/hoverbutton/demos/taro/demo4.tsx index 9ce4b9a1e9..81e31de86b 100644 --- a/src/packages/hoverbutton/demos/taro/demo4.tsx +++ b/src/packages/hoverbutton/demos/taro/demo4.tsx @@ -5,7 +5,7 @@ import React from 'react' import { HoverButton } from '@nutui/nutui-react-taro' import { View, Text } from '@tarojs/components' import { Cart } from '@nutui/icons-react-taro' -import Taro, { pxTransform } from '@tarojs/taro' +import { pxTransform } from '@tarojs/taro' const App = () => { return ( @@ -14,7 +14,7 @@ const App = () => { diff --git a/src/packages/hoverbuttonitem/hoverbuttonitem.taro.tsx b/src/packages/hoverbuttonitem/hoverbuttonitem.taro.tsx index bf6010de3d..82ea6c2482 100644 --- a/src/packages/hoverbuttonitem/hoverbuttonitem.taro.tsx +++ b/src/packages/hoverbuttonitem/hoverbuttonitem.taro.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react' import classNames from 'classnames' import { BaseEventOrig, ITouchEvent, View } from '@tarojs/components' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { harmony, harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' import { getIcon } from '@/packages/hoverbuttonitem/utils' export interface HoverButtonItemProps extends BasicComponent { @@ -22,7 +22,6 @@ const defaultProps = { const classPrefix = 'nut-hoverbutton-item' const isHarmony = harmony() -const isNative = harmonyAndRn() export const HoverButtonItem = (props: Partial) => { const { className, style, icon, onClick, children } = { @@ -32,7 +31,7 @@ export const HoverButtonItem = (props: Partial) => { const [isTouchStart, setTouchStart] = useState(false) // @TODO 待添加暗黑模式及样式变量功能 const nativeProps = useMemo( - () => (isNative ? { color: isTouchStart ? '#595959' : '#1A1A1A' } : {}), + () => (isHarmony ? { color: isTouchStart ? '#595959' : '#1A1A1A' } : {}), [isTouchStart] ) @@ -43,11 +42,11 @@ export const HoverButtonItem = (props: Partial) => { } const handleActiveStart = (event: BaseEventOrig) => { - isNative && setTouchStart(true) + isHarmony && setTouchStart(true) } const handleActiveEnd = (event: BaseEventOrig) => { - isNative && setTouchStart(false) + isHarmony && setTouchStart(false) } const renderBody = () => { @@ -77,7 +76,7 @@ export const HoverButtonItem = (props: Partial) => { return ( { const [translated] = useTranslate({ @@ -58,7 +58,7 @@ const ImageDemo = () => { {translated.position} - {!harmonyAndRn() && ( + {!harmony() && ( <> {translated.lazyload} diff --git a/src/packages/image/image.taro.tsx b/src/packages/image/image.taro.tsx index 6434143636..0c777636cf 100644 --- a/src/packages/image/image.taro.tsx +++ b/src/packages/image/image.taro.tsx @@ -75,11 +75,7 @@ export const Image: FunctionComponent> = (props) => { overflow: radius !== undefined && radius !== null ? 'hidden' : '', borderRadius: // eslint-disable-next-line no-nested-ternary - radius !== undefined && radius != null - ? Taro.getEnv() === 'RN' - ? radius - : pxCheck(radius) - : '', + radius !== undefined && radius != null ? pxCheck(radius) : '', } const imgStyle: any = { diff --git a/src/packages/indicator/demo.taro.tsx b/src/packages/indicator/demo.taro.tsx index 184068c77b..94d28b83df 100644 --- a/src/packages/indicator/demo.taro.tsx +++ b/src/packages/indicator/demo.taro.tsx @@ -55,7 +55,7 @@ const IndicatorDemo = () => { {translated.custom} - {Taro.getEnv() === 'RN' ? null : } + {translated.vertical} diff --git a/src/packages/indicator/demos/taro/demo2.tsx b/src/packages/indicator/demos/taro/demo2.tsx index bf89a986d0..38a62ac50c 100644 --- a/src/packages/indicator/demos/taro/demo2.tsx +++ b/src/packages/indicator/demos/taro/demo2.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Cell, Indicator } from '@nutui/nutui-react-taro' import { View } from '@tarojs/components' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo2 = () => { return ( @@ -10,7 +10,7 @@ const Demo2 = () => { { @@ -11,7 +11,7 @@ const Demo4 = () => { (null) @@ -252,7 +245,7 @@ export const InputNumber: FunctionComponent< return ( - {isRnAndHarmony ? ( + {isHarmony ? ( )} - {isRn ? ( - - ) : ( - - )} + - {isRnAndHarmony ? ( + {isHarmony ? ( { const [translated] = useTranslate({ @@ -28,7 +27,7 @@ const NotifyDemo = () => { return ( <>
- + { const [showNotify, setShowNotify] = useState(false) @@ -43,8 +43,8 @@ const Demo4 = () => { setShowNotify(true) }} /> - {/* RN和HARMONY不支持bottom */} - {harmonyAndRn() ? null : ( + {/* HARMONY不支持bottom */} + {harmony() ? null : ( { diff --git a/src/packages/notify/notify.taro.tsx b/src/packages/notify/notify.taro.tsx index 602ffc9747..7179e715b9 100644 --- a/src/packages/notify/notify.taro.tsx +++ b/src/packages/notify/notify.taro.tsx @@ -2,7 +2,6 @@ import React, { useState, useEffect, FunctionComponent, useRef } from 'react' import classNames from 'classnames' import { CSSTransition } from 'react-transition-group' import { View } from '@tarojs/components' -import Taro from '@tarojs/taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { customEvents, @@ -100,40 +99,24 @@ export const Notify: FunctionComponent> & { [`${classPrefix}-${type}`]: true, }) return ( - <> - {Taro.getEnv() !== Taro.ENV_TYPE.RN ? ( - - - {children} - - - ) : ( - <> - {showNotify ? ( - - {children} - - ) : null} - - )} - + + + {children} + + ) } diff --git a/src/packages/overlay/overlay.scss b/src/packages/overlay/overlay.scss index 8a53fb36f8..b4c6b8eed6 100644 --- a/src/packages/overlay/overlay.scss +++ b/src/packages/overlay/overlay.scss @@ -1,10 +1,5 @@ .nut-overlay { - /* #ifdef rn */ - position: absolute; - /* #endif */ - /* #ifndef rn */ position: fixed; - /* #endif */ top: 0; left: 0; bottom: 0; diff --git a/src/packages/overlay/overlay.taro.tsx b/src/packages/overlay/overlay.taro.tsx index a280732f6d..c7b0f5a1d3 100644 --- a/src/packages/overlay/overlay.taro.tsx +++ b/src/packages/overlay/overlay.taro.tsx @@ -5,7 +5,7 @@ import classNames from 'classnames' import { View, ITouchEvent } from '@tarojs/components' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { useLockScrollTaro } from '@/utils/use-lock-scoll-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' export interface OverlayProps extends BasicComponent { zIndex: number @@ -102,7 +102,7 @@ export const Overlay: FunctionComponent< return ( <> - {!harmonyAndRn() ? ( + {!harmony() ? ( { {/* {translated.ea3d02f2} */} - {harmonyAndRn() ? null : ( + {harmony() ? null : ( <> {translated.c9e6df49} diff --git a/src/packages/popup/demos/taro/demo3.tsx b/src/packages/popup/demos/taro/demo3.tsx index 38adca92ae..e707ba8f2c 100644 --- a/src/packages/popup/demos/taro/demo3.tsx +++ b/src/packages/popup/demos/taro/demo3.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import { Popup, Cell } from '@nutui/nutui-react-taro' import { Heart } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo3 = () => { const [showIcon, setShowIcon] = useState(false) @@ -23,7 +23,7 @@ const Demo3 = () => { }} /> - {harmonyAndRn() ? null : ( + {harmony() ? null : ( <> { const [translated] = useTranslate({ @@ -65,7 +65,7 @@ const ProgressDemo = () => { {translated.dynamicChange} - {!harmonyAndRn() && ( + {!harmony() && ( <> {translated.lazy} diff --git a/src/packages/progress/demos/taro/demo2.tsx b/src/packages/progress/demos/taro/demo2.tsx index eca916fadf..413c024a2c 100644 --- a/src/packages/progress/demos/taro/demo2.tsx +++ b/src/packages/progress/demos/taro/demo2.tsx @@ -1,14 +1,14 @@ import React from 'react' import { Cell, Progress } from '@nutui/nutui-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo2 = () => { return ( diff --git a/src/packages/progress/demos/taro/demo7.tsx b/src/packages/progress/demos/taro/demo7.tsx index 5d683d408c..322e00c313 100644 --- a/src/packages/progress/demos/taro/demo7.tsx +++ b/src/packages/progress/demos/taro/demo7.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react' import { Cell, Button, Toast, Progress } from '@nutui/nutui-react-taro' import { Text } from '@tarojs/components' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo7 = () => { const [value, setValue] = useState(0) @@ -10,7 +10,7 @@ const Demo7 = () => { const [toastMsg, setToastMsg] = useState('') return ( - {!harmonyAndRn() && ( + {!harmony() && ( { if (web()) { handleWebObserver() - } else if (!harmonyAndRn()) { + } else if (!harmony()) { handleOtherObserver() } }, []) @@ -166,19 +166,16 @@ export const Progress: FunctionComponent< if (children) { return 0 } - if (!harmonyAndRn()) { + if (!harmony()) { return Math.floor((`${percent}%`.length * 9) / 2) } - if (rn()) { - return `${percent}%`.length * 9 + 4 - } return Math.floor((`${percent}%`.length * 9 + 4) / 2) } const computeInnerStyle = () => { const style: any = { backgroundColor: color || '#ff0f23', } - if (harmonyAndRn()) { + if (harmony()) { style.width = harmony() ? pxTransform(`${percent}%`.length * 9 + 4) : `${percent}%`.length * 9 + 4 diff --git a/src/packages/pulltorefresh/demo.taro.tsx b/src/packages/pulltorefresh/demo.taro.tsx index 671f5cdb36..dde328b6b9 100644 --- a/src/packages/pulltorefresh/demo.taro.tsx +++ b/src/packages/pulltorefresh/demo.taro.tsx @@ -7,7 +7,7 @@ import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' import Demo4 from './demos/taro/demo4' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const PullToRefreshDemo = () => { const [translated] = useTranslate({ @@ -40,7 +40,7 @@ const PullToRefreshDemo = () => { {translated.primary} - {!harmonyAndRn() && ( + {!harmony() && ( <> {translated.disabled} diff --git a/src/packages/pulltorefresh/pulltorefresh.taro.tsx b/src/packages/pulltorefresh/pulltorefresh.taro.tsx index 10f96811d4..99d3c5ee58 100644 --- a/src/packages/pulltorefresh/pulltorefresh.taro.tsx +++ b/src/packages/pulltorefresh/pulltorefresh.taro.tsx @@ -10,7 +10,6 @@ import { sleep } from '@/utils/sleep' import { BasicComponent, ComponentDefaults, Timeout } from '@/utils/typings' import { PullToRefreshType } from './types' import pxTransform from '@/utils/px-transform' -import { rn } from '@/utils/platform-taro' export type PullStatus = 'pulling' | 'canRelease' | 'refreshing' | 'complete' @@ -126,11 +125,6 @@ export const PullToRefresh: FunctionComponent> = ( setStatus(height > threshold ? 'canRelease' : 'pulling') } clearTimeout(timer.current) - if (rn()) { - timer.current = setTimeout(() => { - handleTouchEnd() - }, 300) - } } async function doRefresh() { diff --git a/src/packages/range/demos/taro/demo1.tsx b/src/packages/range/demos/taro/demo1.tsx index 65544fd703..4b35c598d2 100644 --- a/src/packages/range/demos/taro/demo1.tsx +++ b/src/packages/range/demos/taro/demo1.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo1 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo10.tsx b/src/packages/range/demos/taro/demo10.tsx index 0de7a26c85..3ef93ff5aa 100644 --- a/src/packages/range/demos/taro/demo10.tsx +++ b/src/packages/range/demos/taro/demo10.tsx @@ -1,11 +1,11 @@ import React, { useMemo } from 'react' import { Range, ConfigProvider, Cell } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo10 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo11.tsx b/src/packages/range/demos/taro/demo11.tsx index 803f596a01..408c484965 100644 --- a/src/packages/range/demos/taro/demo11.tsx +++ b/src/packages/range/demos/taro/demo11.tsx @@ -1,12 +1,12 @@ import React, { useMemo, useState } from 'react' import { View, Text } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' -import { rn, harmony, harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' import pxTransform from '@/utils/px-transform' const Demo11 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), @@ -19,14 +19,6 @@ const Demo11 = () => { }, []) const buttonNativeStyle = useMemo(() => { - if (rn()) { - return { - transform: [ - { translateX: pxTransform(-13) }, - { translateY: pxTransform(3) }, - ], - } - } return {} }, []) const [value, setValue] = useState(60) @@ -72,7 +64,7 @@ const Demo11 = () => { : { color: 'white', fontSize: pxTransform(10), - lineHeight: rn() ? pxTransform(18) : '18px', + lineHeight: pxTransform(18), textAlign: 'center', } } diff --git a/src/packages/range/demos/taro/demo12.tsx b/src/packages/range/demos/taro/demo12.tsx index 8c7f5e939a..e392e89380 100644 --- a/src/packages/range/demos/taro/demo12.tsx +++ b/src/packages/range/demos/taro/demo12.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo12 = () => { const verticalStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { height: pxTransform(180), paddingTop: pxTransform(10), diff --git a/src/packages/range/demos/taro/demo13.tsx b/src/packages/range/demos/taro/demo13.tsx index 35ccd90766..c217692005 100644 --- a/src/packages/range/demos/taro/demo13.tsx +++ b/src/packages/range/demos/taro/demo13.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo13 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), @@ -18,7 +18,7 @@ const Demo13 = () => { } }, []) const verticalStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { height: pxTransform(180), paddingTop: pxTransform(10), diff --git a/src/packages/range/demos/taro/demo2.tsx b/src/packages/range/demos/taro/demo2.tsx index cf7b1b1090..181f102c9f 100644 --- a/src/packages/range/demos/taro/demo2.tsx +++ b/src/packages/range/demos/taro/demo2.tsx @@ -1,11 +1,11 @@ import React, { useMemo, useState } from 'react' import { Range, Cell } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo2 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo3.tsx b/src/packages/range/demos/taro/demo3.tsx index f9dc0eb7f3..f9125e97b6 100644 --- a/src/packages/range/demos/taro/demo3.tsx +++ b/src/packages/range/demos/taro/demo3.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo3 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo4.tsx b/src/packages/range/demos/taro/demo4.tsx index 8a153f9423..03f404d30e 100644 --- a/src/packages/range/demos/taro/demo4.tsx +++ b/src/packages/range/demos/taro/demo4.tsx @@ -2,11 +2,11 @@ import React, { useState, useMemo } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo4 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo5.tsx b/src/packages/range/demos/taro/demo5.tsx index 5537ebf2e2..b8bd95a43b 100644 --- a/src/packages/range/demos/taro/demo5.tsx +++ b/src/packages/range/demos/taro/demo5.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo5 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo6.tsx b/src/packages/range/demos/taro/demo6.tsx index dae93f0ff1..622126bb7f 100644 --- a/src/packages/range/demos/taro/demo6.tsx +++ b/src/packages/range/demos/taro/demo6.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo6 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo7.tsx b/src/packages/range/demos/taro/demo7.tsx index 70cc958525..78af45840e 100644 --- a/src/packages/range/demos/taro/demo7.tsx +++ b/src/packages/range/demos/taro/demo7.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo7 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo8.tsx b/src/packages/range/demos/taro/demo8.tsx index 40d7a2ed9d..b73ca04344 100644 --- a/src/packages/range/demos/taro/demo8.tsx +++ b/src/packages/range/demos/taro/demo8.tsx @@ -2,11 +2,11 @@ import React, { useMemo, useState } from 'react' import { View } from '@tarojs/components' import { Range, Cell /* , Toast */ } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo8 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/demos/taro/demo9.tsx b/src/packages/range/demos/taro/demo9.tsx index 19bab8cb58..936ecb2227 100644 --- a/src/packages/range/demos/taro/demo9.tsx +++ b/src/packages/range/demos/taro/demo9.tsx @@ -1,11 +1,11 @@ import React, { useMemo } from 'react' import { Range, Cell } from '@nutui/nutui-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const Demo9 = () => { const cellStyle = useMemo(() => { - return harmonyAndRn() + return harmony() ? { paddingTop: pxTransform(40), paddingBottom: pxTransform(40), diff --git a/src/packages/range/range.taro.tsx b/src/packages/range/range.taro.tsx index 9e5144fed7..b2bd9c11c5 100644 --- a/src/packages/range/range.taro.tsx +++ b/src/packages/range/range.taro.tsx @@ -16,7 +16,7 @@ import { usePropsValue } from '@/utils/use-props-value' import { getRectByTaro } from '@/utils/get-rect-by-taro' import { RangeMark, RangeValue } from './types' import { useRtl } from '../configprovider/index.taro' -import { harmony, harmonyAndRn, rn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' export interface RangeProps extends BasicComponent { value: RangeValue @@ -47,9 +47,7 @@ const defaultProps = { marks: {}, } as RangeProps -const isRn = rn() const isHm = harmony() -const isNative = harmonyAndRn() const classPrefix = 'nut-range' const verticalClassPrefix = `${classPrefix}-vertical` @@ -147,12 +145,12 @@ export const Range: FunctionComponent< const classes = classNames(classPrefix, { [`${classPrefix}-disabled`]: disabled, [verticalClassPrefix]: vertical, - [`${classPrefix}-native`]: isNative, + [`${classPrefix}-native`]: isHm, }) const containerClasses = classNames( `${classPrefix}-container`, { - [`${classPrefix}-container-native`]: isNative, + [`${classPrefix}-container-native`]: isHm, [`${verticalClassPrefix}-container`]: vertical, }, className @@ -341,7 +339,7 @@ export const Range: FunctionComponent< onStart && onStart() } - touch.move(isRn ? event.nativeEvent : event) + touch.move(event) setDragStatus('draging') const rect = await getRectByTaro(root.current) if (!rect) return @@ -410,13 +408,6 @@ export const Range: FunctionComponent< transform: 'translate(-50%, -50%)', } - if (isRn) { - // @TODO 支持变量 - return { - ...borderRadis, - transform: [{ translateX: pxTransform(-12) }], - } - } if (isHm) { return { ...borderRadis, @@ -428,14 +419,6 @@ export const Range: FunctionComponent< } }, []) const buttonNumberTransform = useMemo(() => { - if (isRn) { - // @TODO 支持变量 - return [ - { translateX: pxTransform(vertical ? 26 : -12) }, - { translateY: pxTransform(vertical ? -12 : -26) }, - ] - } - return vertical ? 'translate(100%, -50%)' : 'translate(-50%, -100%)' }, [vertical]) @@ -540,20 +523,9 @@ export const Range: FunctionComponent< ] const wrapperTransform = 'translate(-50%, -50%)' - return isRn ? wrapperTransformRN : wrapperTransform + return wrapperTransform }, [vertical]) const rangeWrapperTransform = useMemo(() => { - if (isRn) { - // @TODO 支持变量 - return [ - { - translateX: pxTransform(-12), - }, - { - translateY: pxTransform(-13), - }, - ] - } return 'translate(-50%, -50%)' }, []) @@ -581,7 +553,7 @@ export const Range: FunctionComponent< onTouchMove={onTouchMove} onTouchEnd={onTouchEnd} onTouchCancel={onTouchEnd} - onClick={(e) => !isRn && e.stopPropagation()} + onClick={(e) => e.stopPropagation()} > {renderButton(index)} @@ -613,7 +585,7 @@ export const Range: FunctionComponent< onTouchMove={onTouchMove} onTouchEnd={onTouchEnd} onTouchCancel={onTouchEnd} - onClick={(e) => !isRn && e.stopPropagation()} + onClick={(e) => e.stopPropagation()} > {renderButton()} diff --git a/src/packages/skeleton/demo.taro.tsx b/src/packages/skeleton/demo.taro.tsx index e75f7846a8..9fc6c71797 100644 --- a/src/packages/skeleton/demo.taro.tsx +++ b/src/packages/skeleton/demo.taro.tsx @@ -10,7 +10,7 @@ import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' import Demo4 from './demos/taro/demo4' import Demo5 from './demos/taro/demo5' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const SkeletonDemo = () => { const [translated] = useTranslate({ @@ -53,7 +53,7 @@ const SkeletonDemo = () => { - {harmonyAndRn() ? null : ( + {harmony() ? null : ( <> {translated['0a001122']} diff --git a/src/packages/skeleton/skeleton.scss b/src/packages/skeleton/skeleton.scss index 74730e6aca..d4afb9b775 100644 --- a/src/packages/skeleton/skeleton.scss +++ b/src/packages/skeleton/skeleton.scss @@ -51,15 +51,6 @@ width: 100%; height: 100%; z-index: 1; - - /* #ifndef rn */ - background: linear-gradient( - 90deg, - hsla(0, 0%, 100%, 0), - hsla(0, 0%, 100%, 0.5) 50%, - hsla(0, 0%, 100%, 0) 80% - ); - /* #endif */ animation: nut-skeleton 2s ease-in-out 0s infinite; } @@ -85,15 +76,6 @@ &-animation { left: auto; right: 0; - - /* #ifndef rn */ - background: linear-gradient( - -90deg, - hsla(0, 0%, 100%, 0), - hsla(0, 0%, 100%, 0.5) 50%, - hsla(0, 0%, 100%, 0) 80% - ); - /* #endif */ animation: nut-skeleton-rtl 2s ease-in-out 0s infinite; } diff --git a/src/packages/swipe/demos/taro/demo2.tsx b/src/packages/swipe/demos/taro/demo2.tsx index 7686c5043d..29be45c690 100644 --- a/src/packages/swipe/demos/taro/demo2.tsx +++ b/src/packages/swipe/demos/taro/demo2.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Swipe } from '@nutui/nutui-react-taro' import { Text, View } from '@tarojs/components' import { Del } from '@nutui/icons-react-taro' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' import pxTransform from '@/utils/px-transform' const ViewNode = (text: string, style: any) => { @@ -18,9 +18,7 @@ const ViewNode = (text: string, style: any) => { ...style, }} > - {!harmonyAndRn() ? ( - - ) : null} + {!harmony() ? : null} {text} diff --git a/src/packages/swipe/demos/taro/demo9.tsx b/src/packages/swipe/demos/taro/demo9.tsx index 866995a1c6..ddb871cc0c 100644 --- a/src/packages/swipe/demos/taro/demo9.tsx +++ b/src/packages/swipe/demos/taro/demo9.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Button, InputNumber, Swipe } from '@nutui/nutui-react-taro' import { Text, View } from '@tarojs/components' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const App = () => { return ( @@ -41,7 +41,7 @@ const App = () => { }} > 商品 - {!harmonyAndRn() ? : null} + {!harmony() ? : null} diff --git a/src/packages/swipe/swipe.taro.tsx b/src/packages/swipe/swipe.taro.tsx index 87abca7bfd..f2df884092 100644 --- a/src/packages/swipe/swipe.taro.tsx +++ b/src/packages/swipe/swipe.taro.tsx @@ -12,7 +12,7 @@ import { BaseEventOrig } from '@tarojs/components/types/common' import { useTouch } from '@/utils/use-touch' import { getRectByTaro } from '@/utils/get-rect-by-taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { harmony, harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' import pxTransform from '@/utils/px-transform' import { useRefState } from '@/utils/use-ref-state' @@ -265,7 +265,7 @@ export const Swipe = forwardRef< })) useEffect(() => { - if (harmonyAndRn()) return + if (harmony()) return const handler: any = (event: { target: Node | null }) => { const targets = [root] diff --git a/src/packages/swiper/demo.taro.tsx b/src/packages/swiper/demo.taro.tsx index e17fb5033c..0491bcdf63 100644 --- a/src/packages/swiper/demo.taro.tsx +++ b/src/packages/swiper/demo.taro.tsx @@ -13,7 +13,7 @@ import Demo6 from './demos/taro/demo6' import Demo7 from './demos/taro/demo7' import Demo8 from './demos/taro/demo8' import Demo9 from './demos/taro/demo9' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' const SwiperDemo = () => { const [translated] = useTranslate({ @@ -70,7 +70,7 @@ const SwiperDemo = () => { {translated.horizontalCenter} - {!harmonyAndRn() ? ( + {!harmony() ? ( <> {translated.verticalCenter} diff --git a/src/packages/swiper/demos/taro/demo5.tsx b/src/packages/swiper/demos/taro/demo5.tsx index 87befffc9d..1bce7d7d6a 100644 --- a/src/packages/swiper/demos/taro/demo5.tsx +++ b/src/packages/swiper/demos/taro/demo5.tsx @@ -3,7 +3,7 @@ import { Swiper } from '@nutui/nutui-react-taro' import { Image, Text, View } from '@tarojs/components' import { ArrowLeft, ArrowRight } from '@nutui/icons-react-taro' import pxTransform from '@/utils/px-transform' -import { harmonyAndRn } from '@/utils/platform-taro' +import { harmony } from '@/utils/platform-taro' function Demo5() { const swiperRef = React.useRef(null) @@ -63,10 +63,10 @@ function Demo5() { swiperRef.current?.prev()}> - {!harmonyAndRn() ? : null} + {!harmony() ? : null} swiperRef.current?.next()}> - {!harmonyAndRn() ? : null} + {!harmony() ? : null} diff --git a/src/packages/swiper/swiper.scss b/src/packages/swiper/swiper.scss index 89cd2b4baf..6a385f595e 100644 --- a/src/packages/swiper/swiper.scss +++ b/src/packages/swiper/swiper.scss @@ -33,16 +33,8 @@ height: 100%; display: flex; position: relative; - &-horizontal { - /* #ifndef rn */ - transform: translateX(var(--swiper-offset)); - /* #ifndef rn */ - } &-vertical { - /* #ifndef rn */ - transform: translateY(var(--swiper-offset)); - /* #ifndef rn */ flex-direction: column; } } @@ -64,9 +56,6 @@ &-indicator { left: auto; right: 50%; - /* #ifndef rn */ - transform: translateX(50%); - /* #endif */ } &-indicator-vertical { left: auto; diff --git a/src/packages/tag/tag.scss b/src/packages/tag/tag.scss index 0f71caa4e4..b5121f2e7d 100644 --- a/src/packages/tag/tag.scss +++ b/src/packages/tag/tag.scss @@ -31,8 +31,6 @@ &-primary { background: #fa2c19; - // RN 不支持渐变色 - // background: $tag-primary-background-color; } &-info { diff --git a/src/packages/toast/demo.taro.tsx b/src/packages/toast/demo.taro.tsx index e2f5421152..2a7fce8a12 100644 --- a/src/packages/toast/demo.taro.tsx +++ b/src/packages/toast/demo.taro.tsx @@ -8,7 +8,7 @@ import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' import Demo4 from './demos/taro/demo4' import Demo5 from './demos/taro/demo5' -import { harmonyAndRn, web } from '@/utils/platform-taro' +import { harmony, web } from '@/utils/platform-taro' const ToastDemo = () => { const [translated] = useTranslate({ @@ -46,7 +46,7 @@ const ToastDemo = () => { {translated.toastCustomIcon} {/* rn和 鸿蒙不支持 break-all */} - {harmonyAndRn() ? null : ( + {harmony() ? null : ( <> {translated.toastWordBreak} diff --git a/src/packages/toast/toast.scss b/src/packages/toast/toast.scss index 37d9a41226..3a325f99dd 100644 --- a/src/packages/toast/toast.scss +++ b/src/packages/toast/toast.scss @@ -11,12 +11,7 @@ } .nut-toast { - /* #ifdef rn */ - position: absolute; - /* #endif */ - /* #ifndef rn */ position: fixed; - /* #endif */ left: 0; top: 0; display: flex; @@ -89,12 +84,7 @@ } &-center { - /* #ifdef rn */ - top: var(--nutui-toast-inner-top, 38%); - /* #endif */ - /* #ifndef rn */ top: var(--nutui-toast-inner-top, 48%); - /* #endif */ } &-bottom { diff --git a/src/utils/get-rect-by-taro.ts b/src/utils/get-rect-by-taro.ts index 6298d0aed4..cf3abd59df 100644 --- a/src/utils/get-rect-by-taro.ts +++ b/src/utils/get-rect-by-taro.ts @@ -1,6 +1,5 @@ import { createSelectorQuery } from '@tarojs/taro' import { getRect, inBrowser } from './use-client-rect' -import { rn } from './platform-taro' export interface Rect { dataset: Record @@ -29,25 +28,6 @@ export const getRectByTaro = async (element: any): Promise => { if (inBrowser) { return Promise.resolve(getRect(element)) } - if (rn()) { - return new Promise((resolve) => { - element.measure( - ( - xPos: number, - yPos: number, - measureWidth: number, - measureHeight: number, - pageX: number, - pageY: number - ) => { - const rect = makeRect(measureWidth, measureHeight) - rect.left = pageX - rect.top = pageY - resolve(rect) - } - ) - }) - } // 小程序下的逻辑 return new Promise((resolve, reject) => { createSelectorQuery() diff --git a/src/utils/platform-taro.ts b/src/utils/platform-taro.ts index 20292aa9a8..659c69e744 100644 --- a/src/utils/platform-taro.ts +++ b/src/utils/platform-taro.ts @@ -1,18 +1,10 @@ import Taro from '@tarojs/taro' -export const harmonyAndRn = () => { - return ['rn', 'jdrn', 'harmony', 'jdharmony', 'harmonyhybrid'].includes( - Taro.getEnv().toLowerCase() - ) -} export const harmony = () => { return ['harmony', 'harmonyhybrid', 'jdharmony'].includes( Taro.getEnv().toLowerCase() ) } -export const rn = () => { - return ['rn', 'jdrn'].includes(Taro.getEnv().toLowerCase()) -} export const web = () => { return ['web'].includes(Taro.getEnv().toLowerCase()) } diff --git a/src/utils/px-transform.ts b/src/utils/px-transform.ts index d9197e8477..4fdb22486d 100644 --- a/src/utils/px-transform.ts +++ b/src/utils/px-transform.ts @@ -1,9 +1,8 @@ import { pxTransform as transform } from '@tarojs/taro' -import { harmony, rn } from './platform-taro' +import { harmony } from './platform-taro' export default function pxTransform(value: number, radix?: number): any { // @ts-ignore if (harmony()) return transform(value, radix || 375) - if (rn()) return value return `${value}px` }