Merge pull request #17 from 1eeing/main

uikit v9.6.2
netease-kit · Sep 22, 2023 · 7a3e52f · 7a3e52f
2 parents cea3edf + 978a1b2
commit 7a3e52f
Show file tree

Hide file tree

Showing 13 changed files with 758 additions and 575 deletions.
diff --git a/react/package.json b/react/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@xkit-yx/call-kit": "^2.0.1",
     "@xkit-yx/call-kit-react-ui": "^0.4.1",
-    "@xkit-yx/im-kit-ui": "^9.6.0",
+    "@xkit-yx/im-kit-ui": "^9.6.2",
     "react-dom": "^16.8.0",
     "umi": "^3.5.40"
   },

diff --git a/react/src/YXUIKit/im-kit-ui/package.json b/react/src/YXUIKit/im-kit-ui/package.json
@@ -1,35 +1,38 @@
 {
-  "_from": "@xkit-yx/im-kit-ui@^9.6.0",
-  "_id": "@xkit-yx/[email protected].0",
+  "_from": "@xkit-yx/im-kit-ui@^9.6.2",
+  "_id": "@xkit-yx/[email protected].2",
   "_inBundle": false,
-  "_integrity": "sha512-J5t6zWcqjtW6PQv4t8Mj3JmY2yUaGJ8X5lxxCoivtiEl5hNXOAA3U7REcdFhxkeq7TFSl0eXxeWokmfcg7mGuA==",
+  "_integrity": "sha512-vFleF0DzxDgYJQnOWQKU6gkOC7Okqk8X1xvADTHVSK7toL8lHPP2PL/qEnQWOa0lffdQOYFy3B3OJxS+It1/+Q==",
   "_location": "/@xkit-yx/im-kit-ui",
-  "_phantomChildren": {},
+  "_phantomChildren": {
+    "axios": "0.27.2",
+    "eventemitter3": "4.0.7"
+  },
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "@xkit-yx/im-kit-ui@^9.6.0",
+    "raw": "@xkit-yx/im-kit-ui@^9.6.2",
     "name": "@xkit-yx/im-kit-ui",
     "escapedName": "@xkit-yx%2fim-kit-ui",
     "scope": "@xkit-yx",
-    "rawSpec": "^9.6.0",
+    "rawSpec": "^9.6.2",
     "saveSpec": null,
-    "fetchSpec": "^9.6.0"
+    "fetchSpec": "^9.6.2"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/@xkit-yx/im-kit-ui/-/im-kit-ui-9.6.0.tgz",
-  "_shasum": "14695835abff91d327fcbf0b4dcdeda746dd7bcf",
-  "_spec": "@xkit-yx/im-kit-ui@^9.6.0",
+  "_resolved": "https://registry.npmjs.org/@xkit-yx/im-kit-ui/-/im-kit-ui-9.6.2.tgz",
+  "_shasum": "e9dd04a9d359c36fa404900ec28aca70bc8ee022",
+  "_spec": "@xkit-yx/im-kit-ui@^9.6.2",
   "_where": "/Users/leeing/Documents/yunxin-projects/nim-uikit-web/react",
   "author": "",
   "bundleDependencies": false,
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
-    "@xkit-yx/core-kit": "^0.10.6",
-    "@xkit-yx/im-store": "^0.0.11",
-    "@xkit-yx/utils": "^0.5.5",
+    "@xkit-yx/core-kit": "^0.10.8",
+    "@xkit-yx/im-store": "^0.0.13",
+    "@xkit-yx/utils": "^0.5.6",
     "antd": "^4.16.3",
     "mobx": "^6.6.1",
     "mobx-react": "^7.5.2",
@@ -66,7 +69,7 @@
     "es",
     "copySourceCode.js"
   ],
-  "gitHead": "b3bbc966437ee1b3e69ef1c4ffeae88003030588",
+  "gitHead": "3b90601cf3d29a01c3aa986043a84af0c04562d0",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -90,5 +93,5 @@
     "start": "rollup -cw --environment DEV"
   },
   "typings": "es/index.d.ts",
-  "version": "9.6.0"
+  "version": "9.6.2"
 }
diff --git a/react/src/YXUIKit/im-kit-ui/src/chat/Container.tsx b/react/src/YXUIKit/im-kit-ui/src/chat/Container.tsx
@@ -14,7 +14,7 @@ import { observer } from 'mobx-react'
 
 import packageJson from '../../package.json'
 import { GroupItemProps } from './components/ChatTeamSetting/GroupItem'
-import { MenuItem, MenuItemKey } from './components/ChatMessageItem'
+import { MenuItem } from './components/ChatMessageItem'
 import { SettingActionItemProps } from './components/ChatActionBar'
 
 export interface ActionRenderProps extends ChatMessageInputProps {

diff --git a/react/src/YXUIKit/im-kit-ui/src/chat/components/ChatMessageInput/ChatMentionMemberList.tsx b/react/src/YXUIKit/im-kit-ui/src/chat/components/ChatMessageInput/ChatMentionMemberList.tsx
@@ -8,7 +8,7 @@ import {
 import { TeamMember } from 'nim-web-sdk-ng/dist/NIM_BROWSER_SDK/TeamServiceInterface'
 import classNames from 'classnames'
 import { observer } from 'mobx-react'
-import { AT_ALL_ACCOUNT } from '@xkit-yx/im-store'
+import { storeConstants } from '@xkit-yx/im-store'
 
 export type MentionedMember = { account: string; appellation: string }
 
@@ -55,7 +55,7 @@ export const ChatAtMemberList: React.FC<ChatMentionMemberList> = observer(
           } else if (e.key === 'Enter') {
             if (activeIndex === -1) {
               onSelect?.({
-                account: AT_ALL_ACCOUNT,
+                account: storeConstants.AT_ALL_ACCOUNT,
                 appellation: t('teamAll'),
               })
             } else {
@@ -87,7 +87,7 @@ export const ChatAtMemberList: React.FC<ChatMentionMemberList> = observer(
             })}
             onClick={() =>
               onSelect?.({
-                account: AT_ALL_ACCOUNT,
+                account: storeConstants.AT_ALL_ACCOUNT,
                 appellation: t('teamAll'),
               })
             }

diff --git a/react/src/YXUIKit/im-kit-ui/src/chat/components/ChatMessageInput/index.tsx b/react/src/YXUIKit/im-kit-ui/src/chat/components/ChatMessageInput/index.tsx
@@ -19,7 +19,7 @@ import {
 } from '../../../common'
 import { Action } from '../../Container'
 import { MAX_UPLOAD_FILE_SIZE } from '../../../constant'
-import { AT_ALL_ACCOUNT } from '@xkit-yx/im-store'
+import { storeConstants } from '@xkit-yx/im-store'
 import { LoadingOutlined, CloseOutlined } from '@ant-design/icons'
 import { TMsgScene } from 'nim-web-sdk-ng/dist/NIM_BROWSER_SDK/MsgServiceInterface'
 import { observer } from 'mobx-react'
@@ -245,7 +245,10 @@ const ChatMessageInput = observer(
       if (selectedAtMembers.length) {
         selectedAtMembers
           .filter((member) => {
-            if (!allowAtAll && member.account === AT_ALL_ACCOUNT) {
+            if (
+              !allowAtAll &&
+              member.account === storeConstants.AT_ALL_ACCOUNT
+            ) {
               return false
             }
             return true