@amityco/react-native-social-uikit 4.0.0-RC.22 → 4.0.0-RC.24

package/src/v4/component/RenderTextWithMention/RenderTextWithMention.tsx

@@ -88,8 +88,8 @@ const RenderTextWithMention: React.FC<IrenderTextWithMention> = ({
   }
 
   let currentPosition = 0;
-  const result: (string | JSX.Element)[][] = heightlightTextPositions.map(
-    ({ index, length, userId, link }, i) => {
+  const result: (string | React.ReactElement)[][] =
+    heightlightTextPositions.map(({ index, length, userId, link }, i) => {
       // Add non-highlighted text before the mention
       const nonHighlightedText = textPost.slice(currentPosition, index);
       // Add highlighted text
@@ -109,8 +109,7 @@ const RenderTextWithMention: React.FC<IrenderTextWithMention> = ({
 
       // Return an array of non-highlighted and highlighted text
       return [nonHighlightedText, highlightedText];
-    }
-  );
+    });
 
   // Add any remaining non-highlighted text after the mentions
   const remainingText = textPost.slice(currentPosition);

package/src/v4/component/StoryKit/src/Story.tsx

@@ -22,7 +22,9 @@ export const Story = ({
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [currentPage, setCurrentPage] = useState<number>(0);
   const [selectedData, setSelectedData] = useState<IUserStory[]>([]);
-  const cube = useRef<CubeNavigationHorizontal | AndroidCubeEffect>();
+  const cube = useRef<CubeNavigationHorizontal | AndroidCubeEffect | null>(
+    null
+  );
   // Component Functions
   const _handleStoryItemPress = (item: IUserStory, index?: number) => {
     if (item?.stories?.length === 0) return;

package/src/v4/component/StoryKit/src/StoryCircleListItem.tsx

@@ -25,7 +25,7 @@ const StoryCircleListItem = ({
   const styles = useStyles();
   const [, setIsPressed] = useState(item?.seen);
   const prevSeen = usePrevious(item?.seen);
-  const hasStoryPermission = useStoryPermission(item.user_id);
+  const { hasStoryPermission } = useStoryPermission(item.user_id);
   const { getUiKitConfig } = useConfig();
   const storyRingColor: string[] = item?.seen
     ? ['#e2e2e2', '#e2e2e2']

package/src/v4/component/StoryKit/src/StoryListItem.tsx

@@ -61,7 +61,7 @@ export const StoryListItem = ({
   isModerator,
 }: StoryListItemProps) => {
   const styles = useStyles();
-  const hasStoryPermission = useStoryPermission(userId);
+  const { hasStoryPermission } = useStoryPermission(userId);
   const { getUiKitConfig } = useConfig();
   const storyReactionBgColor =
     (getUiKitConfig({

package/src/v4/component/StoryKit/src/helpers/StateHelpers.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 
-export function usePrevious(value: any) {
-  const ref = useRef();
+export function usePrevious<T>(value: T): T | undefined {
+  const ref = useRef<T | undefined>(undefined);
   useEffect(() => {
     ref.current = value;
   });

package/src/v4/elements/ChangeThumbnailButton/ChangeThumbnailButton.tsx

@@ -16,7 +16,7 @@ const ChangeThumbnailButton = ({
   pageId = PageID.WildCardPage,
   componentId = ComponentID.WildCardComponent,
   ...props
-}: ChangeThumbnailButtonProps): JSX.Element => {
+}: ChangeThumbnailButtonProps): React.ReactElement => {
   const { themeStyles, config } = useAmityElement({
     pageId,
     componentId,

package/src/v4/elements/DeleteThumbnailButton/DeleteThumbnailButton.tsx

@@ -16,7 +16,7 @@ const ChangeThumbnailButton = ({
   pageId = PageID.WildCardPage,
   componentId = ComponentID.WildCardComponent,
   ...props
-}: ChangeThumbnailButtonProps): JSX.Element => {
+}: ChangeThumbnailButtonProps): React.ReactElement => {
   const { themeStyles, config } = useAmityElement({
     pageId,
     componentId,

package/src/v4/features/community/Setting/elements/CloseCommunityDescription/CloseCommunityDescription.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
-import { TouchableOpacityProps } from 'react-native';
+import { TextProps } from 'react-native';
 import { useAmityElement } from '../../../../../../v4/hook';
 import { ComponentID, ElementID, PageID } from '../../../../../../v4/enum';
 import { useStyles } from './styles';
 import { Typography } from '../../../../../../v4/component/Typography/Typography';
 
-type CloseCommunityDescriptionProps = TouchableOpacityProps & {
+type CloseCommunityDescriptionProps = TextProps & {
   pageId?: PageID;
   componentId?: ComponentID;
   elementId?: ElementID;

package/src/v4/hook/index.ts

@@ -14,7 +14,7 @@ export * from './useCommunities';
 export * from './useCommunity';
 export * from './useCategory';
 export * from './useUiKitReference';
-export * from './useIsCommunityModerator';
+export * from './isModerator';
 export * from './useSearch';
 export * from './useTimeDifference';
 export * from './useReaction';

package/src/v4/hook/isModerator.ts

@@ -0,0 +1,19 @@
+import { MemberRoles } from '../constants';
+
+const { COMMUNITY_MODERATOR, CHANNEL_MODERATOR, MODERATOR, SUPER_MODERATOR } =
+  MemberRoles;
+
+export const isModerator = (userRoles?: string[]) => {
+  if (!userRoles?.length) {
+    return false;
+  }
+
+  const roles: string[] = [
+    COMMUNITY_MODERATOR,
+    CHANNEL_MODERATOR,
+    MODERATOR,
+    SUPER_MODERATOR,
+  ];
+
+  return userRoles.some((role) => roles.includes(role));
+};

package/src/v4/hook/useStoryPermission.ts

@@ -1,11 +1,7 @@
 import useAuth from '../../hooks/useAuth';
 import { useUser } from './useUser';
 import useSocialSettings from '../core/hooks/useSocialSettings';
-import {
-  isAdmin,
-  isModerator,
-  checkStoryPermission,
-} from '../utils/permissions';
+import { checkStoryPermission, isAdmin } from '../utils/permissions';
 
 export function useStoryPermission(communityId?: string) {
   const { client } = useAuth();
@@ -13,14 +9,12 @@ export function useStoryPermission(communityId?: string) {
   const user = useUser(client?.userId || '');
 
   const isGlobalAdmin = isAdmin(user?.roles);
-  const isModeratorUser = isModerator(user?.roles);
 
   const hasStoryPermission = !communityId
     ? socialSettings?.story?.allowAllUserToCreateStory
     : socialSettings?.story?.allowAllUserToCreateStory ||
       isGlobalAdmin ||
-      isModeratorUser ||
       checkStoryPermission(client, communityId);
 
-  return hasStoryPermission;
+  return { hasStoryPermission };
 }

package/src/v4/utils/permissions.ts

@@ -49,14 +49,19 @@ export const isAdmin = (roles: string[] = []) => {
 };
 
 export const checkStoryPermission = (
-  client: Amity.Client,
-  communityId: string
-) => {
-  if (!client || !communityId) return false;
+  client: Amity.Client | null | undefined,
+  communityId?: string
+): boolean => {
+  if (!client) {
+    return false;
+  }
 
-  const communityPermission = client
-    .hasPermission(Permissions.ManageStoryPermission)
-    .community(communityId);
+  if (communityId) {
+    const communityPermission = client
+      .hasPermission(Permissions.ManageStoryPermission)
+      .community(communityId);
+    return communityPermission;
+  }
 
-  return !!communityPermission;
+  return false;
 };

package/lib/commonjs/v4/hook/useIsCommunityModerator.js

@@ -1,43 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useIsCommunityModerator = void 0;
-var _tsSdkReactNative = require("@amityco/ts-sdk-react-native");
-var _permission = require("../../util/permission");
-var _react = require("react");
-const useIsCommunityModerator = ({
-  userId,
-  communityId
-}) => {
-  const [isCommunityModerator, setisCommunityModerator] = (0, _react.useState)(false);
-  (0, _react.useEffect)(() => {
-    if (!userId || !communityId) return setisCommunityModerator(false);
-    const unsub = _tsSdkReactNative.CommunityRepository.Membership.searchMembers({
-      communityId: communityId,
-      search: userId,
-      limit: 1,
-      sortBy: 'firstCreated',
-      memberships: ['member']
-    }, async ({
-      error,
-      loading,
-      data
-    }) => {
-      if (error) return setisCommunityModerator(false);
-      if (!loading) {
-        var _data$;
-        const userRoles = ((_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.roles) ?? [];
-        return setisCommunityModerator(() => (0, _permission.isModerator)(userRoles));
-      }
-      return setisCommunityModerator(false);
-    });
-    return () => unsub();
-  }, [communityId, userId]);
-  return {
-    isCommunityModerator: isCommunityModerator
-  };
-};
-exports.useIsCommunityModerator = useIsCommunityModerator;
-//# sourceMappingURL=useIsCommunityModerator.js.map

package/lib/commonjs/v4/hook/useIsCommunityModerator.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_tsSdkReactNative","require","_permission","_react","useIsCommunityModerator","userId","communityId","isCommunityModerator","setisCommunityModerator","useState","useEffect","unsub","CommunityRepository","Membership","searchMembers","search","limit","sortBy","memberships","error","loading","data","_data$","userRoles","roles","isModerator","exports"],"sourceRoot":"../../../../src","sources":["v4/hook/useIsCommunityModerator.ts"],"mappings":";;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAEO,MAAMG,uBAAuB,GAAGA,CAAC;EACtCC,MAAM;EACNC;AAIF,CAAC,KAAK;EACJ,MAAM,CAACC,oBAAoB,EAAEC,uBAAuB,CAAC,GAAG,IAAAC,eAAQ,EAAC,KAAK,CAAC;EACvE,IAAAC,gBAAS,EAAC,MAAM;IACd,IAAI,CAACL,MAAM,IAAI,CAACC,WAAW,EAAE,OAAOE,uBAAuB,CAAC,KAAK,CAAC;IAClE,MAAMG,KAAK,GAAGC,qCAAmB,CAACC,UAAU,CAACC,aAAa,CACxD;MACER,WAAW,EAAEA,WAAW;MACxBS,MAAM,EAAEV,MAAM;MACdW,KAAK,EAAE,CAAC;MACRC,MAAM,EAAE,cAAc;MACtBC,WAAW,EAAE,CAAC,QAAQ;IACxB,CAAC,EACD,OAAO;MAAEC,KAAK;MAAEC,OAAO;MAAEC;IAAK,CAAC,KAAK;MAClC,IAAIF,KAAK,EAAE,OAAOX,uBAAuB,CAAC,KAAK,CAAC;MAChD,IAAI,CAACY,OAAO,EAAE;QAAA,IAAAE,MAAA;QACZ,MAAMC,SAAS,GAAG,EAAAD,MAAA,GAAAD,IAAI,CAAC,CAAC,CAAC,cAAAC,MAAA,uBAAPA,MAAA,CAASE,KAAK,KAAI,EAAE;QACtC,OAAOhB,uBAAuB,CAAC,MAAM,IAAAiB,uBAAW,EAACF,SAAS,CAAC,CAAC;MAC9D;MACA,OAAOf,uBAAuB,CAAC,KAAK,CAAC;IACvC,CACF,CAAC;IACD,OAAO,MAAMG,KAAK,CAAC,CAAC;EACtB,CAAC,EAAE,CAACL,WAAW,EAAED,MAAM,CAAC,CAAC;EACzB,OAAO;IAAEE,oBAAoB,EAAEA;EAAqB,CAAC;AACvD,CAAC;AAACmB,OAAA,CAAAtB,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/lib/module/v4/hook/useIsCommunityModerator.js

@@ -1,36 +0,0 @@
-import { CommunityRepository } from '@amityco/ts-sdk-react-native';
-import { isModerator } from '../../util/permission';
-import { useEffect, useState } from 'react';
-export const useIsCommunityModerator = ({
-  userId,
-  communityId
-}) => {
-  const [isCommunityModerator, setisCommunityModerator] = useState(false);
-  useEffect(() => {
-    if (!userId || !communityId) return setisCommunityModerator(false);
-    const unsub = CommunityRepository.Membership.searchMembers({
-      communityId: communityId,
-      search: userId,
-      limit: 1,
-      sortBy: 'firstCreated',
-      memberships: ['member']
-    }, async ({
-      error,
-      loading,
-      data
-    }) => {
-      if (error) return setisCommunityModerator(false);
-      if (!loading) {
-        var _data$;
-        const userRoles = ((_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.roles) ?? [];
-        return setisCommunityModerator(() => isModerator(userRoles));
-      }
-      return setisCommunityModerator(false);
-    });
-    return () => unsub();
-  }, [communityId, userId]);
-  return {
-    isCommunityModerator: isCommunityModerator
-  };
-};
-//# sourceMappingURL=useIsCommunityModerator.js.map

package/lib/module/v4/hook/useIsCommunityModerator.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["CommunityRepository","isModerator","useEffect","useState","useIsCommunityModerator","userId","communityId","isCommunityModerator","setisCommunityModerator","unsub","Membership","searchMembers","search","limit","sortBy","memberships","error","loading","data","_data$","userRoles","roles"],"sourceRoot":"../../../../src","sources":["v4/hook/useIsCommunityModerator.ts"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,8BAA8B;AAClE,SAASC,WAAW,QAAQ,uBAAuB;AACnD,SAASC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAE3C,OAAO,MAAMC,uBAAuB,GAAGA,CAAC;EACtCC,MAAM;EACNC;AAIF,CAAC,KAAK;EACJ,MAAM,CAACC,oBAAoB,EAAEC,uBAAuB,CAAC,GAAGL,QAAQ,CAAC,KAAK,CAAC;EACvED,SAAS,CAAC,MAAM;IACd,IAAI,CAACG,MAAM,IAAI,CAACC,WAAW,EAAE,OAAOE,uBAAuB,CAAC,KAAK,CAAC;IAClE,MAAMC,KAAK,GAAGT,mBAAmB,CAACU,UAAU,CAACC,aAAa,CACxD;MACEL,WAAW,EAAEA,WAAW;MACxBM,MAAM,EAAEP,MAAM;MACdQ,KAAK,EAAE,CAAC;MACRC,MAAM,EAAE,cAAc;MACtBC,WAAW,EAAE,CAAC,QAAQ;IACxB,CAAC,EACD,OAAO;MAAEC,KAAK;MAAEC,OAAO;MAAEC;IAAK,CAAC,KAAK;MAClC,IAAIF,KAAK,EAAE,OAAOR,uBAAuB,CAAC,KAAK,CAAC;MAChD,IAAI,CAACS,OAAO,EAAE;QAAA,IAAAE,MAAA;QACZ,MAAMC,SAAS,GAAG,EAAAD,MAAA,GAAAD,IAAI,CAAC,CAAC,CAAC,cAAAC,MAAA,uBAAPA,MAAA,CAASE,KAAK,KAAI,EAAE;QACtC,OAAOb,uBAAuB,CAAC,MAAMP,WAAW,CAACmB,SAAS,CAAC,CAAC;MAC9D;MACA,OAAOZ,uBAAuB,CAAC,KAAK,CAAC;IACvC,CACF,CAAC;IACD,OAAO,MAAMC,KAAK,CAAC,CAAC;EACtB,CAAC,EAAE,CAACH,WAAW,EAAED,MAAM,CAAC,CAAC;EACzB,OAAO;IAAEE,oBAAoB,EAAEA;EAAqB,CAAC;AACvD,CAAC","ignoreList":[]}

package/lib/typescript/src/v4/hook/useIsCommunityModerator.d.ts

@@ -1,7 +0,0 @@
-export declare const useIsCommunityModerator: ({ userId, communityId, }: {
-    userId: string;
-    communityId: string;
-}) => {
-    isCommunityModerator: boolean;
-};
-//# sourceMappingURL=useIsCommunityModerator.d.ts.map

package/lib/typescript/src/v4/hook/useIsCommunityModerator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useIsCommunityModerator.d.ts","sourceRoot":"","sources":["../../../../../src/v4/hook/useIsCommunityModerator.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,GAAI,0BAGrC;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;;CAwBA,CAAC"}

package/src/v4/hook/useIsCommunityModerator.ts

@@ -1,35 +0,0 @@
-import { CommunityRepository } from '@amityco/ts-sdk-react-native';
-import { isModerator } from '../../util/permission';
-import { useEffect, useState } from 'react';
-
-export const useIsCommunityModerator = ({
-  userId,
-  communityId,
-}: {
-  userId: string;
-  communityId: string;
-}) => {
-  const [isCommunityModerator, setisCommunityModerator] = useState(false);
-  useEffect(() => {
-    if (!userId || !communityId) return setisCommunityModerator(false);
-    const unsub = CommunityRepository.Membership.searchMembers(
-      {
-        communityId: communityId,
-        search: userId,
-        limit: 1,
-        sortBy: 'firstCreated',
-        memberships: ['member'],
-      },
-      async ({ error, loading, data }) => {
-        if (error) return setisCommunityModerator(false);
-        if (!loading) {
-          const userRoles = data[0]?.roles ?? [];
-          return setisCommunityModerator(() => isModerator(userRoles));
-        }
-        return setisCommunityModerator(false);
-      }
-    );
-    return () => unsub();
-  }, [communityId, userId]);
-  return { isCommunityModerator: isCommunityModerator };
-};