Merge pull request #4 from veytu/dev/personalFive

merge new feat
AgoraIO-Community · Sep 29, 2024 · 8ff5181 · 8ff5181
2 parents cd1841a + 8a37fc1
commit 8ff5181
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 20 deletions.
diff --git a/src/components/svg-img/paths/fcr_mobile_color_size.tsx b/src/components/svg-img/paths/fcr_mobile_color_size.tsx
@@ -3,16 +3,10 @@ import React from 'react';
 import { PathOptions } from '../svg-dict';
 
 export const path = ({ iconPrimary }: PathOptions) => (
-  <g>
-    <circle
-      cx="16"
-      cy="15.9997"
-      r="9"
-      transform="rotate(90 16 15.9997)"
-      stroke={iconPrimary}
-      stroke-width="2"
-    />
-    <circle cx="16" cy="15.9997" r="6" transform="rotate(90 16 15.9997)" fill={iconPrimary} />
-  </g>
+  <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="16" cy="16.0005" r="9" transform="rotate(90 16 16.0005)" stroke={iconPrimary} stroke-width="2" />
+    <circle cx="16" cy="16.0005" r="6" transform="rotate(90 16 16.0005)" fill={iconPrimary} />
+  </svg>
 );
+
 export const viewBox = '0 0 32 32';
diff --git a/src/components/svg-img/paths/fcr_mobile_whiteboard_ped_line.tsx b/src/components/svg-img/paths/fcr_mobile_whiteboard_ped_line.tsx
@@ -2,16 +2,17 @@ import React from 'react';
 
 import { PathOptions } from '../svg-dict';
 
-export const path = ({ iconPrimary }: PathOptions) => (
+export const path = ({ iconPrimary,iconSecondary }: PathOptions) => (
   <g>
-    <path
-      fill={iconPrimary}
-      d="M27.3364 15.0785L25.9963 17.0161C25.9206 17.1257 25.8212 17.2168 25.7055 17.2827L19.4047 20.8749M17.1014 7.99974L15.7538 9.94825C15.6829 10.0508 15.6343 10.1671 15.6113 10.2897L14.2872 17.3356M19.4047 20.8749L14.5968 23.6161C13.9387 23.9912 13.143 23.4241 13.2829 22.6797L14.2872 17.3356M19.4047 20.8749L14.2872 17.3356"
-      stroke="white"
+  <path
+    fill={iconPrimary}
+    d="M27.3364 15.0785L25.9963 17.0161C25.9206 17.1257 25.8212 17.2168 25.7055 17.2827L19.4047 20.8749M17.1014 7.99974L15.7538 9.94825C15.6829 10.0508 15.6343 10.1671 15.6113 10.2897L14.2872 17.3356M19.4047 20.8749L14.5968 23.6161C13.9387 23.9912 13.143 23.4241 13.2829 22.6797L14.2872 17.3356M19.4047 20.8749L14.2872 17.3356"
+      stroke={iconSecondary?iconSecondary:'white'}
       stroke-width="1.77778"
       stroke-linecap="round"
-    />
-    <path d="M8 24L12.4444 24" stroke="white" stroke-width="1.77778" stroke-linecap="round" />
-  </g>
+  />
+  <path d="M8 24L12.4444 24" stroke={iconSecondary?iconSecondary:'white'} stroke-width="1.77778" stroke-linecap="round" />
+</g>
 );
 export const viewBox = '0 0 32 32';
+
diff --git a/src/components/svg-img/paths/fcr_whitechoose-new.tsx b/src/components/svg-img/paths/fcr_whitechoose-new.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { PathOptions } from '../svg-dict';
+
+export const path = ({ iconPrimary }: PathOptions) => (
+  <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fillRule="evenodd" clipRule="evenodd" d="M9.00606 9.69222C9.08993 9.67563 9.17711 9.66683 9.26701 9.66683H9.56784C9.93603 9.66683 10.2345 9.36835 10.2345 9.00016C10.2345 8.63197 9.93603 8.3335 9.56784 8.3335H9.26701C9.08977 8.3335 8.91593 8.35088 8.74731 8.38424C8.38612 8.45569 8.15124 8.80642 8.22269 9.16761C8.29415 9.5288 8.64488 9.76368 9.00606 9.69222ZM11.3728 8.3335C11.0047 8.3335 10.7062 8.63197 10.7062 9.00016C10.7062 9.36835 11.0047 9.66683 11.3728 9.66683H11.9745C12.3427 9.66683 12.6412 9.36835 12.6412 9.00016C12.6412 8.63197 12.3427 8.3335 11.9745 8.3335H11.3728ZM13.7795 8.3335C13.4113 8.3335 13.1128 8.63197 13.1128 9.00016C13.1128 9.36835 13.4113 9.66683 13.7795 9.66683H14.3812C14.7494 9.66683 15.0478 9.36835 15.0478 9.00016C15.0478 8.63197 14.7494 8.3335 14.3812 8.3335H13.7795ZM16.1862 8.3335C15.818 8.3335 15.5195 8.63197 15.5195 9.00016C15.5195 9.36835 15.818 9.66683 16.1862 9.66683H16.7878C17.156 9.66683 17.4545 9.36835 17.4545 9.00016C17.4545 8.63197 17.156 8.3335 16.7878 8.3335H16.1862ZM18.5928 8.3335C18.2247 8.3335 17.9262 8.63197 17.9262 9.00016C17.9262 9.36835 18.2247 9.66683 18.5928 9.66683H19.1945C19.5627 9.66683 19.8612 9.36835 19.8612 9.00016C19.8612 8.63197 19.5627 8.3335 19.1945 8.3335H18.5928ZM20.9995 8.3335C20.6313 8.3335 20.3328 8.63197 20.3328 9.00016C20.3328 9.36835 20.6313 9.66683 20.9995 9.66683H21.3003C21.3902 9.66683 21.4774 9.67563 21.5613 9.69222C21.9225 9.76368 22.2732 9.5288 22.3447 9.16761C22.4161 8.80642 22.1812 8.45569 21.82 8.38424C21.6514 8.35088 21.4776 8.3335 21.3003 8.3335H20.9995ZM23.9163 10.4805C23.8448 10.1193 23.4941 9.88439 23.1329 9.95585C22.7717 10.0273 22.5368 10.378 22.6083 10.7392C22.6249 10.8231 22.6337 10.9103 22.6337 11.0002V11.4002C22.6337 11.7684 22.9322 12.0668 23.3003 12.0668C23.6685 12.0668 23.967 11.7684 23.967 11.4002V11.0002C23.967 10.8229 23.9496 10.6491 23.9163 10.4805ZM7.95907 10.7392C8.03052 10.378 7.79565 10.0273 7.43446 9.95585C7.07327 9.88439 6.72254 10.1193 6.65108 10.4805C6.61773 10.6491 6.60034 10.8229 6.60034 11.0002V11.3752C6.60034 11.7434 6.89882 12.0418 7.26701 12.0418C7.6352 12.0418 7.93368 11.7434 7.93368 11.3752V11.0002C7.93368 10.9103 7.94248 10.8231 7.95907 10.7392ZM7.93368 13.6252C7.93368 13.257 7.6352 12.9585 7.26701 12.9585C6.89882 12.9585 6.60034 13.257 6.60034 13.6252V14.3752C6.60034 14.7434 6.89882 15.0418 7.26701 15.0418C7.6352 15.0418 7.93368 14.7434 7.93368 14.3752V13.6252ZM23.967 13.8002C23.967 13.432 23.6685 13.1335 23.3003 13.1335C22.9322 13.1335 22.6337 13.432 22.6337 13.8002V14.2002C22.6337 14.5684 22.9322 14.8668 23.3003 14.8668C23.6685 14.8668 23.967 14.5684 23.967 14.2002V13.8002ZM7.93368 16.6252C7.93368 16.257 7.6352 15.9585 7.26701 15.9585C6.89882 15.9585 6.60034 16.257 6.60034 16.6252V17.3752C6.60034 17.7434 6.89882 18.0418 7.26701 18.0418C7.6352 18.0418 7.93368 17.7434 7.93368 17.3752V16.6252ZM7.93368 19.6252C7.93368 19.257 7.6352 18.9585 7.26701 18.9585C6.89882 18.9585 6.60034 19.257 6.60034 19.6252V20.0002C6.60034 20.1774 6.61773 20.3512 6.65108 20.5199C6.72254 20.8811 7.07327 21.1159 7.43446 21.0445C7.79565 20.973 8.03052 20.6223 7.95907 20.2611C7.94248 20.1772 7.93368 20.0901 7.93368 20.0002V19.6252ZM9.00606 21.3081C8.64487 21.2366 8.29415 21.4715 8.22269 21.8327C8.15124 22.1939 8.38612 22.5446 8.74731 22.6161C8.91593 22.6494 9.08977 22.6668 9.26701 22.6668H9.54479C9.91298 22.6668 10.2115 22.3684 10.2115 22.0002C10.2115 21.632 9.91298 21.3335 9.54479 21.3335H9.26701C9.17711 21.3335 9.08992 21.3247 9.00606 21.3081ZM11.2115 21.3335C10.8433 21.3335 10.5448 21.632 10.5448 22.0002C10.5448 22.3684 10.8433 22.6668 11.2115 22.6668H11.767C12.1352 22.6668 12.4337 22.3684 12.4337 22.0002C12.4337 21.632 12.1352 21.3335 11.767 21.3335H11.2115ZM13.4337 21.3335C13.0655 21.3335 12.767 21.632 12.767 22.0002C12.767 22.3684 13.0655 22.6668 13.4337 22.6668H13.9892C14.3574 22.6668 14.6559 22.3684 14.6559 22.0002C14.6559 21.632 14.3574 21.3335 13.9892 21.3335H13.4337ZM15.6559 21.3335C15.2877 21.3335 14.9892 21.632 14.9892 22.0002C14.9892 22.3684 15.2877 22.6668 15.6559 22.6668H15.9337C16.3019 22.6668 16.6003 22.3684 16.6003 22.0002C16.6003 21.632 16.3019 21.3335 15.9337 21.3335H15.6559Z" fill="#373C42" />
+    <path fillRule="evenodd" clipRule="evenodd" d="M20.0445 25.7248L16.9322 16.2442C16.7835 15.7911 17.0302 15.3032 17.4834 15.1544C17.6609 15.0961 17.8526 15.097 18.0296 15.1569L27.4665 18.3506C27.9183 18.5035 28.1606 18.9937 28.0077 19.4455C27.9277 19.682 27.7491 19.8723 27.5182 19.9673L23.5082 21.6168C23.3391 21.6863 23.2059 21.8221 23.1395 21.9926L21.6698 25.7687C21.4968 26.2132 20.9962 26.4333 20.5518 26.2603C20.3111 26.1666 20.1251 25.9702 20.0445 25.7248Z" stroke="#151515" strokeWidth="1.6" strokeLinecap="round" strokeLinejoin="round" />
+  </svg>
+);
+export const viewBox = '0 0 32 32';
diff --git a/src/components/svg-img/paths/fcr_whitechoose-pen.tsx b/src/components/svg-img/paths/fcr_whitechoose-pen.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { PathOptions } from '../svg-dict';
+
+export const path = ({ iconPrimary }: PathOptions) => (
+  <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M27.3366 15.0785L25.9964 17.0161C25.9207 17.1257 25.8213 17.2168 25.7056 17.2827L19.4048 20.8749M17.1015 7.99974L15.7539 9.94825C15.683 10.0508 15.6344 10.1671 15.6114 10.2897L14.2873 17.3356M19.4048 20.8749L14.5969 23.6161C13.9389 23.9912 13.1431 23.4241 13.283 22.6797L14.2873 17.3356M19.4048 20.8749L14.2873 17.3356" stroke="#151515" stroke-width="1.77778" stroke-linecap="round" />
+    <path d="M8 24L12.4444 24" stroke="#151515" stroke-width="1.77778" stroke-linecap="round" />
+  </svg>
+);
+export const viewBox = '0 0 32 32';
diff --git a/src/components/svg-img/paths/whiteboard-fullscreen-landscape-close.tsx b/src/components/svg-img/paths/whiteboard-fullscreen-landscape-close.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { PathOptions } from '../svg-dict';
+
+export const path = ({ iconPrimary }: PathOptions) => (
+  <svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 19C0 8.50659 8.50659 0 19 0C29.4934 0 38 8.50659 38 19C38 29.4934 29.4934 38 19 38C8.50659 38 0 29.4934 0 19Z" fill="#151515" fillOpacity="0.8" />
+    <path fillRule="evenodd" clipRule="evenodd" d="M14.8848 16.183C15.6028 16.183 16.1848 15.601 16.1848 14.883L16.1848 12.7163C16.1848 12.2975 15.8453 11.958 15.4265 11.958C15.0077 11.958 14.6681 12.2975 14.6681 12.7163V14.6663L12.7181 14.6663C12.2993 14.6663 11.9598 15.0059 11.9598 15.4247C11.9598 15.8435 12.2993 16.183 12.7181 16.183H14.8848ZM23.0096 21.7083C22.2916 21.7083 21.7096 22.2903 21.7096 23.0083V25.1749C21.7096 25.5938 22.0491 25.9333 22.4679 25.9333C22.8867 25.9333 23.2263 25.5938 23.2263 25.1749V23.2249H25.1763C25.5951 23.2249 25.9346 22.8854 25.9346 22.4666C25.9346 22.0478 25.5951 21.7083 25.1763 21.7083H23.0096ZM14.8846 21.7081C15.6026 21.7081 16.1846 22.2902 16.1846 23.0081L16.1846 25.1748C16.1846 25.5936 15.8451 25.9331 15.4263 25.9331C15.0074 25.9331 14.6679 25.5936 14.6679 25.1748V23.2248H12.7179C12.2991 23.2248 11.9596 22.8853 11.9596 22.4665C11.9596 22.0477 12.2991 21.7081 12.7179 21.7081H14.8846ZM21.7096 14.8831C21.7096 15.6011 22.2916 16.1831 23.0096 16.1831H25.1763C25.5951 16.1831 25.9346 15.8436 25.9346 15.4248C25.9346 15.006 25.5951 14.6664 25.1763 14.6664H23.2263V12.7164C23.2263 12.2976 22.8867 11.9581 22.4679 11.9581C22.0491 11.9581 21.7096 12.2976 21.7096 12.7164V14.8831Z" fill="white" />
+  </svg>
+);
+
+export const viewBox = '0 0 38 38';
diff --git a/src/components/svg-img/paths/whiteboard-fullscreen-landscape.tsx b/src/components/svg-img/paths/whiteboard-fullscreen-landscape.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { PathOptions } from '../svg-dict';
+
+export const path = ({ iconPrimary }: PathOptions) => (
+  <svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 19C0 8.50659 8.50659 0 19 0C29.4934 0 38 8.50659 38 19C38 29.4934 29.4934 38 19 38C8.50659 38 0 29.4934 0 19Z" fill="#151515" fillOpacity="0.8" />
+    <path d="M14 21H12V26H17V24H14V21ZM12 17H14V14H17V12H12V17ZM24 24H21V26H26V21H24V24ZM21 12V14H24V17H26V12H21Z" fill="#FEFEFE" />
+  </svg>
+);
+
+export const viewBox = '0 0 38 38';
diff --git a/src/components/svg-img/type.ts b/src/components/svg-img/type.ts
@@ -169,6 +169,8 @@ export enum SvgIconEnum {
   FCR_VIDEOBACK = 'fcr_videoback',
   FCR_WHITEBOARD = 'fcr_whiteboard',
   WHITEBOARDEDIT = 'whiteboardedit',
+  WHITEBOARDFULLSCREEN_LANDSCAPE_CLOSE = 'whiteboard-fullscreen-landscape-close',
+  WHITEBOARDFULLSCREEN_LANDSCAPE = 'whiteboard-fullscreen-landscape',
   FCR_WHITEBOARD_BACK = 'fcr_whiteboard_back',
   FCR_WHITEBOARD_CLOUD = 'fcr_whiteboard_cloud',
   FCR_WHITEBOARD_ELIMINATE = 'fcr_whiteboard_eliminate',
@@ -198,6 +200,10 @@ export enum SvgIconEnum {
   FCR_WHITEBOARD_TEXT = 'fcr_whiteboard_text',
   FCR_WHITEBOARD_TOOLBOX = 'fcr_whiteboard_toolbox',
   FCR_WHITECHOOSE = 'fcr_whitechoose',
+  FCR_WHITECHOOSE_NEW = 'fcr_whitechoose-new',
+  FCR_WHITECHOOSE_PEN = 'fcr_whitechoose-pen',
+
+
   FCR_WHITEBOARD_TOOLS = 'fcr_whiteboard_tools',
   FCR_CLEANWHITEBOARD = 'fcr_cleanwhiteboard',
   FCR_MOBILE_NEWWHITEBOARDPAGE = 'fcr_mobile_newwhiteboardpage',

diff --git a/src/components/textarea/helper.ts b/src/components/textarea/helper.ts
@@ -2,7 +2,7 @@ function textNodesUnder(node: Node | null | undefined) {
   // https://stackoverflow.com/a/10730777/3245937
   let all = [] as Node[];
   for (node = node?.firstChild; node; node = node.nextSibling) {
-    if (node.nodeType == 3) {
+    if (node.nodeType === 3) {
       all.push(node);
     } else {
       all = all.concat(textNodesUnder(node));