Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/packages/tag/demos/taro/demo2.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
// import { Failure } from '@nutui/icons-react-taro'
import { Failure } from '@nutui/icons-react-taro'
import { Cell, Tag } from '@nutui/nutui-react-taro'
import Taro from '@tarojs/taro'

Expand Down Expand Up @@ -41,9 +41,7 @@ const Demo2 = () => {
extra={
<Tag
closeable
// TODO: icon 适配
closeIcon="C"
// closeIcon={<Failure size={8} />}
closeIcon={<Failure size={8} />}
onClose={() => Taro.showToast({ title: 'Tag closed' })}
type="primary"
>
Expand Down
24 changes: 7 additions & 17 deletions src/packages/tag/tag.taro.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { MouseEvent } from 'react'
import React, {
CSSProperties,
FunctionComponent,
useState,
ReactNode,
useState,
} from 'react'
import type { MouseEvent } from 'react'
import { View, ITouchEvent, Text } from '@tarojs/components'
// import { Close } from '@nutui/icons-react-taro'
import { ITouchEvent, View } from '@tarojs/components'
import { Close } from '@nutui/icons-react-taro'
import classNames from 'classnames'

import { BasicComponent, ComponentDefaults } from '@/utils/typings'
Expand Down Expand Up @@ -132,23 +132,13 @@ export const Tag: FunctionComponent<Partial<TagProps>> = (props) => {
{closeIcon}
</View>
) : (
// TODO: icon 适配
// <Close
// size={8}
// onClick={(e) => {
// setVisible(false)
// onClose && onClose(e)
// }}
// />
<Text
<Close
size={8}
onClick={(e) => {
setVisible(false)
onClose && onClose(e)
}}
className={`${classPrefix}-custom-icon`}
>
X
</Text>
/>
)}
</View>
)
Expand Down