未验证 提交 60e79664 编写于 作者: O oasis-cloud 提交者: GitHub

fix: taro 包不需要依赖 react-router-dom (#475)

上级 f7c8baae
{
"name": "@nutui/nutui-react",
"version": "1.3.11",
"name": "@nutui/nutui-react-taro",
"version": "1.3.12-beta.3",
"style": "dist/style.css",
"main": "dist/nutui.react.umd.js",
"module": "dist/esm/nutui-react.es.js",
......@@ -64,6 +64,8 @@
"lint": "eslint ./src/packages/calendar",
"lint:fix": "eslint --fix ./src/packages/calendar",
"publish:beta": "npm publish --tag beta",
"prepublishOnly": "node scripts/taro/prepublish.js",
"postpublish": "node scripts/taro/postpublish.js",
"prepare": "husky install",
"test": "jest",
"test:demo": "jest --testNamePattern=^should match snapshot$ --runTestsByPath ./src/packages/collapse/__test__/collapse.spec.tsx",
......@@ -92,7 +94,6 @@
"@react-spring/web": "^9.3.2",
"@use-gesture/react": "^10.2.9",
"classnames": "^2.3.1",
"mobx-react-lite": "^3.4.0",
"react-router-dom": "^5.2.0",
"react-transition-group": "^4.4.2"
},
......@@ -154,6 +155,7 @@
"map-stream": "0.0.7",
"marked": "^2.0.3",
"mobx": "^6.6.2",
"mobx-react-lite": "^3.4.0",
"postcss-import": "^14.0.2",
"postcss-modules": "^4.2.2",
"prettier": "2.3.0",
......
const path = require('path')
const fsExtra = require('fs-extra')
const packageData = require('../../package.json')
if (packageData.name.indexOf('-taro')) {
fsExtra.copySync(
path.join(process.cwd(), 'node_modules/.cache/package.json.bk'),
path.join(process.cwd(), 'package.json'),
{ overwrite: true }
)
fsExtra.removeSync(
path.join(process.cwd(), 'node_modules/.cache/package.json.bk')
)
}
const path = require('path')
const packageData = require('../../package.json')
const fsExtra = require('fs-extra')
if (packageData.name.indexOf('-taro')) {
fsExtra.copySync(
path.join(process.cwd(), 'package.json'),
path.join(process.cwd(), 'node_modules/.cache/package.json.bk'),
{ overwrite: true }
)
delete packageData.dependencies['react-router-dom']
fsExtra.writeJsonSync(path.join(process.cwd(), 'package.json'), packageData, {
spaces: 2,
})
}
import React, { FunctionComponent, ReactNode } from 'react'
import { useHistory } from 'react-router-dom'
import Taro from '@tarojs/taro'
import bem from '@/utils/bem'
import Icon from '@/packages/icon/index.taro'
......@@ -76,23 +75,10 @@ export const Cell: FunctionComponent<
...props,
}
const b = bem('cell')
const history = useHistory()
const handleClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
click(event)
onClick(event)
if (to && history) {
history[replace ? 'replace' : 'push'](to)
} else if (url) {
if (
url.startsWith('https://') ||
url.startsWith('http://') ||
url.startsWith('//')
) {
replace ? window.location.replace(url) : (window.location.href = url)
} else {
Taro.navigateTo({ url })
}
}
const link = to || url
replace ? Taro.redirectTo({ url: link }) : Taro.navigateTo({ url: link })
}
const baseStyle = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册