tuikit-atomicx-vue3 4.4.0 → 4.5.0

package/src/utils/call.ts

@@ -1,6 +1,5 @@
 import { TUIFriendService, TUIUserService, TUIChatEngine } from '@tencentcloud/chat-uikit-engine';
 import TUICore, { TUIConstants } from '@tencentcloud/tui-core';
-import { i18next } from '@tencentcloud/uikit-base-component-vue3';
 import { safeJSONParse } from './json';
 import type { StartCallParams, CallMessagePayload } from '../types/call';
 import type { MessageModel } from '../types/engine';
@@ -114,7 +113,7 @@ const userShowNameMap = new Map<string, string>();
  */
 const requestedUserMap = new Map<string, number>();
 
-function parseCallMessageText(message: MessageModel): string {
+function parseCallMessageText(message: MessageModel, t: any): string {
   const callMessagePayload = parseCallMessage(message);
 
   if (!callMessagePayload || callMessagePayload.data.businessID !== 1) {
@@ -134,63 +133,63 @@ function parseCallMessageText(message: MessageModel): string {
     case 1: {
       if (objectData?.data?.cmd === 'audioCall' || objectData?.data?.cmd === 'videoCall') {
         if (data.groupID) {
-          return i18next.t('CallMessage.start_call', { messageSender });
+          return t('CallMessage.start_call', { messageSender });
         }
       }
       if (objectData?.data?.cmd === 'hangup') {
         if (data.groupID) {
-          return i18next.t('CallMessage.call_ended');
+          return t('CallMessage.call_ended');
         }
-        return `${i18next.t('CallMessage.call_duration')}: ${formatTime(objectData?.call_end)}`;
+        return `${t('CallMessage.call_duration')}: ${formatTime(objectData?.call_end)}`;
       }
       if (objectData?.data?.cmd === 'switchToAudio') {
-        return i18next.t('CallMessage.switch_to_audio_call');
+        return t('CallMessage.switch_to_audio_call');
       }
       if (objectData?.data?.cmd === 'switchToVideo') {
-        return i18next.t('CallMessage.switch_to_video_call');
+        return t('CallMessage.switch_to_video_call');
       }
       // when CDM is abnormal, the default return value is start call
-      return i18next.t('CallMessage.start_call', { messageSender: '' });
+      return t('CallMessage.start_call', { messageSender: '' });
     }
     case 2:
       if (data.groupID) {
-        return `${messageSender} ${i18next.t('CallMessage.cancel_call')}`;
+        return `${messageSender} ${t('CallMessage.cancel_call')}`;
       }
       if (data.inviter === myUserID) {
-        return i18next.t('CallMessage.canceled');
+        return t('CallMessage.canceled');
       }
-      return i18next.t('CallMessage.canceled_by_recipient');
+      return t('CallMessage.canceled_by_recipient');
     case 3:
       if (objectData?.data?.cmd === 'switchToAudio') {
-        return i18next.t('CallMessage.switch_to_audio_call');
+        return t('CallMessage.switch_to_audio_call');
       }
       if (objectData?.data?.cmd === 'switchToVideo') {
-        return i18next.t('CallMessage.switch_to_video_call');
+        return t('CallMessage.switch_to_video_call');
       }
       if (data.groupID) {
-        return `${messageSender} ${i18next.t('CallMessage.answered')}`;
+        return `${messageSender} ${t('CallMessage.answered')}`;
       }
-      return i18next.t('CallMessage.answered');
+      return t('CallMessage.answered');
     case 4:
       if (data.groupID) {
-        return `${messageSender} ${i18next.t('CallMessage.decline_call')}`;
+        return `${messageSender} ${t('CallMessage.decline_call')}`;
       }
       if (objectData?.line_busy === 'line_busy' || objectData?.data?.message === 'lineBusy') {
         if (data.inviter === myUserID) {
-          return i18next.t('CallMessage.line_busy');
+          return t('CallMessage.line_busy');
         }
-        return i18next.t('CallMessage.missed_due_to_busy');
+        return t('CallMessage.missed_due_to_busy');
       }
       if (data.inviter === myUserID) {
-        return i18next.t('CallMessage.declined_by_recipient');
+        return t('CallMessage.declined_by_recipient');
       }
-      return i18next.t('CallMessage.declined');
+      return t('CallMessage.declined');
     case 5:
       if (objectData?.data?.cmd === 'switchToAudio') {
-        return i18next.t('CallMessage.switch_to_audio_call');
+        return t('CallMessage.switch_to_audio_call');
       }
       if (objectData?.data?.cmd === 'switchToVideo') {
-        return i18next.t('CallMessage.switch_to_video_call');
+        return t('CallMessage.switch_to_video_call');
       }
       if (data.groupID) {
         // group call initiator timeout
@@ -202,15 +201,15 @@ function parseCallMessageText(message: MessageModel): string {
             inviteeList += `${substringByLength(showName)}、`;
           });
           inviteeList = inviteeList.substring(0, inviteeList.lastIndexOf('、'));
-          return `${inviteeList} ${i18next.t('CallMessage.no_answer')}`;
+          return `${inviteeList} ${t('CallMessage.no_answer')}`;
         }
         // group call recipient timeout
-        return `${messageSender} ${i18next.t('CallMessage.no_answer')}`;
+        return `${messageSender} ${t('CallMessage.no_answer')}`;
       }
       if (data.inviter === myUserID) {
-        return i18next.t('CallMessage.no_answer_from_recipient');
+        return t('CallMessage.no_answer_from_recipient');
       }
-      return i18next.t('CallMessage.no_answer_timeout');
+      return t('CallMessage.no_answer_timeout');
     default:
       return '';
   }

package/src/utils/compare.ts

@@ -0,0 +1,34 @@
+export type Comparator<T> = (a: T, b: T) => -1 | 0 | 1;
+/**
+ * Creates a new combined {@link Comparator<T>} which sorts items by the given comparators.
+ * The comparators are applied in the order they are given (left -> right).
+ *
+ * @param comparators the comparators to use for sorting.
+ * @returns a combined {@link Comparator<T>}.
+ */
+export const combineComparators = <T>(
+  ...comparators: Comparator<T>[]
+): Comparator<T> => (a, b) => {
+  for (const comparator of comparators) {
+    const result = comparator(a, b);
+    if (result !== 0) {
+      return result;
+    }
+  }
+  return 0;
+};
+
+export const createComparator = <T>(
+  compareRules: (data1: T, data2: T) => boolean,
+) => (a: T, b: T) => {
+  if (compareRules(a, b) && compareRules(b, a)) {
+    return 0;
+  }
+  if (compareRules(a, b)) {
+    return -1;
+  }
+  if (compareRules(b, a)) {
+    return 1;
+  }
+  return 0;
+};

package/tsconfig.eslint.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.vue",
+    "src/**/*.d.ts",
+    "tests/**/*.ts",
+    "**/*.vue",
+    ".eslintrc.cjs"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}

package/tsconfig.json

@@ -28,7 +28,13 @@
       "@/types": ["src/types"]
     }
   },
-  "include": ["src/**/*.ts", "src/**/*.vue", "tests/**/*.ts"],
+  "include": [
+    "src/**/*.ts", 
+    "src/**/*.vue", 
+    "src/**/*.d.ts",
+    "tests/**/*.ts",
+    "**/*.vue"
+  ],
   "references": [
     {
       "path": "./tsconfig.node.json"

package/dist/AudioRequestDialog.vue_vue_type_script_setup_true_lang-DESfuJPj.js

@@ -1,89 +0,0 @@
-import { defineComponent as y, ref as i, onUnmounted as U, createBlock as w, openBlock as k, unref as t, withCtx as r, createElementVNode as V, toDisplayString as m, createVNode as I, createTextVNode as h } from "vue";
-import b, { TUIRoomEvents as l, TUIRequestAction as x, TUIRole as A } from "@tencentcloud/tuiroom-engine-js";
-import { TUIButton as g } from "@tencentcloud/uikit-base-component-vue3";
-import E from "./baseComp/Dialog/DialogPC.js";
-import { useI18n as O } from "./locales/index.js";
-import { useRoomEngine as D } from "./hooks/useRoomEngine.js";
-import { useUserState as B } from "./states/UserState/index.js";
-const G = /* @__PURE__ */ y({
-  __name: "AudioRequestDialog",
-  setup(M) {
-    const s = D(), { t: n } = O(), d = i(""), { getUserInfo: C } = B(), a = i(!1), u = i("");
-    async function f(e) {
-      var v;
-      const { userId: o, requestAction: c, requestId: T } = e.request;
-      if (c === x.kRequestToOpenRemoteMicrophone) {
-        const _ = ((v = C({ userId: o })) == null ? void 0 : v.userRole) === A.kRoomOwner ? n("RoomOwner") : n("Admin");
-        d.value = n("Sb invites you to turn on the microphone", {
-          role: _
-        }), u.value = T, a.value = !0;
-      }
-    }
-    async function p() {
-      var e;
-      await ((e = s.instance) == null ? void 0 : e.responseRemoteRequest({
-        requestId: u.value,
-        agree: !0
-      })), u.value = "", a.value = !1;
-    }
-    async function R() {
-      var e;
-      await ((e = s.instance) == null ? void 0 : e.responseRemoteRequest({
-        requestId: u.value,
-        agree: !1
-      })), u.value = "", a.value = !1;
-    }
-    async function q(e) {
-      const { requestId: o } = e;
-      u.value === o && (a.value = !1);
-    }
-    return b.once("ready", () => {
-      var e, o;
-      (e = s.instance) == null || e.on(l.onRequestReceived, f), (o = s.instance) == null || o.on(l.onRequestCancelled, q);
-    }), U(() => {
-      var e, o;
-      (e = s.instance) == null || e.off(l.onRequestReceived, f), (o = s.instance) == null || o.off(
-        l.onRequestCancelled,
-        q
-      );
-    }), (e, o) => (k(), w(t(E), {
-      modelValue: a.value,
-      "onUpdate:modelValue": o[0] || (o[0] = (c) => a.value = c),
-      title: t(n)("Tips"),
-      modal: !0,
-      "show-close": !1,
-      "close-on-click-modal": !1,
-      width: "500px",
-      "append-to-room-container": !0,
-      "confirm-button": t(n)("Turn on the microphone"),
-      "cancel-button": t(n)("Keep it closed"),
-      onConfirm: p,
-      onCancel: R
-    }, {
-      footer: r(() => [
-        I(t(g), {
-          onClick: p,
-          type: "primary"
-        }, {
-          default: r(() => [
-            h(m(t(n)("Turn on the microphone")), 1)
-          ]),
-          _: 1
-        }),
-        I(t(g), { onClick: R }, {
-          default: r(() => [
-            h(m(t(n)("Keep it closed")), 1)
-          ]),
-          _: 1
-        })
-      ]),
-      default: r(() => [
-        V("span", null, m(d.value), 1)
-      ]),
-      _: 1
-    }, 8, ["modelValue", "title", "confirm-button", "cancel-button"]));
-  }
-});
-export {
-  G as _
-};

package/dist/index-DTq2ybsB.js

@@ -1,33 +0,0 @@
-import { defineComponent as c, provide as d, reactive as l, createElementBlock as p, openBlock as o, createBlock as t, createCommentVNode as i } from "vue";
-import s from "./components/VideoSetting/VideoMediaControl.js";
-import { _ as m } from "./VideoRequestDialog.vue_vue_type_script_setup_true_lang-DlROoquV.js";
-import u from "./components/VideoSetting/VideoSettingTab.js";
-import { _ as f } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const y = /* @__PURE__ */ c({
-  __name: "index",
-  props: {
-    displayMode: {},
-    supportSwitchCamera: { type: Boolean, default: !0 },
-    supportSwitchResolution: { type: Boolean, default: !0 },
-    supportVideoPreview: { type: Boolean, default: !0 },
-    supportSwitchMirror: { type: Boolean, default: !0 }
-  },
-  emits: ["click-icon"],
-  setup(e, { emit: n }) {
-    const r = n;
-    function a() {
-      r("click-icon");
-    }
-    return d("videoSettingProps", l(e)), (M, B) => (o(), p("div", null, [
-      e.displayMode === "Icon" || e.displayMode === "IconWithPanel" ? (o(), t(s, {
-        key: 0,
-        onClickIcon: a
-      })) : i("", !0),
-      e.displayMode === "Panel" ? (o(), t(u, { key: 1 })) : i("", !0),
-      e.displayMode !== "Panel" ? (o(), t(m, { key: 2 })) : i("", !0)
-    ]));
-  }
-}), _ = /* @__PURE__ */ f(y, [["__scopeId", "data-v-ea3e0b27"]]);
-export {
-  _ as V
-};

package/dist/index.vue_vue_type_script_setup_true_lang-DZIBxSQ7.js

@@ -1,32 +0,0 @@
-import { defineComponent as l, provide as p, reactive as u, createElementBlock as m, openBlock as o, createBlock as n, createCommentVNode as r, unref as t } from "vue";
-import s from "./components/AudioSetting/AudioMediaControl.js";
-import f from "./components/AudioSetting/AudioSettingTab.js";
-import { _ as y } from "./AudioRequestDialog.vue_vue_type_script_setup_true_lang-DESfuJPj.js";
-import { MediaSettingDisplayMode as i } from "./types/device.js";
-const P = /* @__PURE__ */ l({
-  __name: "index",
-  props: {
-    displayMode: {},
-    supportSwitchMicrophone: { type: Boolean, default: !0 },
-    supportSwitchSpeaker: { type: Boolean, default: !0 },
-    supportAudioLevel: { type: Boolean, default: !0 }
-  },
-  emits: ["click-icon"],
-  setup(e, { emit: a }) {
-    const c = a;
-    function d() {
-      c("click-icon");
-    }
-    return p("audioSettingProps", u(e)), (M, h) => (o(), m("div", null, [
-      e.displayMode === t(i).Icon || e.displayMode === t(i).IconWithPanel ? (o(), n(s, {
-        key: 0,
-        onClickIcon: d
-      })) : r("", !0),
-      e.displayMode === t(i).Panel ? (o(), n(f, { key: 1 })) : r("", !0),
-      e.displayMode !== t(i).Panel ? (o(), n(y, { key: 2 })) : r("", !0)
-    ]));
-  }
-});
-export {
-  P as _
-};