Skip to content

Commit 2a64e2d

Browse files
anuradha9712anuradha9712
committed
chore: rebase with develop branch
1 parent 2329bd7 commit 2a64e2d

File tree

25 files changed

+1911
-40810
lines changed

25 files changed

+1911
-40810
lines changed

‎core/components/atoms/avatar/__tests__/__snapshots__/Avatar.test.tsx.snap‎

Lines changed: 0 additions & 460 deletions
Large diffs are not rendered by default.

‎core/components/atoms/avatar/avatarImage/__tests__/__snapshots__/AvatarImage.test.tsx.snap‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@ exports[`Avatar Image component
1616
<div
1717
aria-expanded="false"
1818
aria-haspopup="dialog"
19-
<<<<<<< HEAD
20-
<<<<<<< HEAD
2119
class="flex-grow-0"
22-
=======
23-
>>>>>>> b67de59a (feat: migration to react 19)
24-
=======
25-
class="flex-grow-0"
26-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
2720
data-state="closed"
2821
triggerclass="flex-grow-0"
2922
>

‎core/components/atoms/avatarGroup/__tests__/__snapshots__/AvatarGroup.test.tsx.snap‎

Lines changed: 0 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,7 @@ exports[`AvatarGroup component snapshot
2525
<div
2626
aria-expanded="false"
2727
aria-haspopup="dialog"
28-
<<<<<<< HEAD
29-
<<<<<<< HEAD
3028
class="flex-grow-0"
31-
=======
32-
>>>>>>> b67de59a (feat: migration to react 19)
33-
=======
34-
class="flex-grow-0"
35-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
3629
data-state="closed"
3730
triggerclass="flex-grow-0"
3831
>
@@ -74,14 +67,7 @@ exports[`AvatarGroup component snapshot
7467
<div
7568
aria-expanded="false"
7669
aria-haspopup="dialog"
77-
<<<<<<< HEAD
78-
<<<<<<< HEAD
79-
class="flex-grow-0"
80-
=======
81-
>>>>>>> b67de59a (feat: migration to react 19)
82-
=======
8370
class="flex-grow-0"
84-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
8571
data-state="closed"
8672
triggerclass="flex-grow-0"
8773
>
@@ -111,10 +97,6 @@ exports[`AvatarGroup component snapshot
11197
</div>
11298
</div>
11399
</div>
114-
<<<<<<< HEAD
115-
<<<<<<< HEAD
116-
=======
117-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
118100
<div
119101
data-floating-ui-portal=""
120102
id=":rk:"
@@ -123,11 +105,6 @@ exports[`AvatarGroup component snapshot
123105
data-floating-ui-portal=""
124106
id=":rn:"
125107
/>
126-
<<<<<<< HEAD
127-
=======
128-
>>>>>>> b67de59a (feat: migration to react 19)
129-
=======
130-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
131108
</body>,
132109
"container": <div>
133110
<div
@@ -148,14 +125,7 @@ exports[`AvatarGroup component snapshot
148125
<div
149126
aria-expanded="false"
150127
aria-haspopup="dialog"
151-
<<<<<<< HEAD
152-
<<<<<<< HEAD
153128
class="flex-grow-0"
154-
=======
155-
>>>>>>> b67de59a (feat: migration to react 19)
156-
=======
157-
class="flex-grow-0"
158-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
159129
data-state="closed"
160130
triggerclass="flex-grow-0"
161131
>
@@ -197,14 +167,7 @@ exports[`AvatarGroup component snapshot
197167
<div
198168
aria-expanded="false"
199169
aria-haspopup="dialog"
200-
<<<<<<< HEAD
201-
<<<<<<< HEAD
202-
class="flex-grow-0"
203-
=======
204-
>>>>>>> b67de59a (feat: migration to react 19)
205-
=======
206170
class="flex-grow-0"
207-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
208171
data-state="closed"
209172
triggerclass="flex-grow-0"
210173
>
@@ -313,14 +276,7 @@ exports[`AvatarGroup component snapshot
313276
<div
314277
aria-expanded="false"
315278
aria-haspopup="dialog"
316-
<<<<<<< HEAD
317-
<<<<<<< HEAD
318279
class="flex-grow-0"
319-
=======
320-
>>>>>>> b67de59a (feat: migration to react 19)
321-
=======
322-
class="flex-grow-0"
323-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
324280
data-state="closed"
325281
triggerclass="flex-grow-0"
326282
>
@@ -362,14 +318,7 @@ exports[`AvatarGroup component snapshot
362318
<div
363319
aria-expanded="false"
364320
aria-haspopup="dialog"
365-
<<<<<<< HEAD
366-
<<<<<<< HEAD
367-
class="flex-grow-0"
368-
=======
369-
>>>>>>> b67de59a (feat: migration to react 19)
370-
=======
371321
class="flex-grow-0"
372-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
373322
data-state="closed"
374323
triggerclass="flex-grow-0"
375324
>
@@ -399,10 +348,6 @@ exports[`AvatarGroup component snapshot
399348
</div>
400349
</div>
401350
</div>
402-
<<<<<<< HEAD
403-
<<<<<<< HEAD
404-
=======
405-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
406351
<div
407352
data-floating-ui-portal=""
408353
id=":re:"
@@ -411,11 +356,6 @@ exports[`AvatarGroup component snapshot
411356
data-floating-ui-portal=""
412357
id=":rh:"
413358
/>
414-
<<<<<<< HEAD
415-
=======
416-
>>>>>>> b67de59a (feat: migration to react 19)
417-
=======
418-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
419359
</body>,
420360
"container": <div>
421361
<div
@@ -436,14 +376,7 @@ exports[`AvatarGroup component snapshot
436376
<div
437377
aria-expanded="false"
438378
aria-haspopup="dialog"
439-
<<<<<<< HEAD
440-
<<<<<<< HEAD
441379
class="flex-grow-0"
442-
=======
443-
>>>>>>> b67de59a (feat: migration to react 19)
444-
=======
445-
class="flex-grow-0"
446-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
447380
data-state="closed"
448381
triggerclass="flex-grow-0"
449382
>
@@ -485,14 +418,7 @@ exports[`AvatarGroup component snapshot
485418
<div
486419
aria-expanded="false"
487420
aria-haspopup="dialog"
488-
<<<<<<< HEAD
489-
<<<<<<< HEAD
490-
class="flex-grow-0"
491-
=======
492-
>>>>>>> b67de59a (feat: migration to react 19)
493-
=======
494421
class="flex-grow-0"
495-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
496422
data-state="closed"
497423
triggerclass="flex-grow-0"
498424
>
@@ -601,14 +527,7 @@ exports[`AvatarGroup component snapshot
601527
<div
602528
aria-expanded="false"
603529
aria-haspopup="dialog"
604-
<<<<<<< HEAD
605-
<<<<<<< HEAD
606530
class="flex-grow-0"
607-
=======
608-
>>>>>>> b67de59a (feat: migration to react 19)
609-
=======
610-
class="flex-grow-0"
611-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
612531
data-state="closed"
613532
triggerclass="flex-grow-0"
614533
>
@@ -650,14 +569,7 @@ exports[`AvatarGroup component snapshot
650569
<div
651570
aria-expanded="false"
652571
aria-haspopup="dialog"
653-
<<<<<<< HEAD
654-
<<<<<<< HEAD
655-
class="flex-grow-0"
656-
=======
657-
>>>>>>> b67de59a (feat: migration to react 19)
658-
=======
659572
class="flex-grow-0"
660-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
661573
data-state="closed"
662574
triggerclass="flex-grow-0"
663575
>
@@ -687,10 +599,6 @@ exports[`AvatarGroup component snapshot
687599
</div>
688600
</div>
689601
</div>
690-
<<<<<<< HEAD
691-
<<<<<<< HEAD
692-
=======
693-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
694602
<div
695603
data-floating-ui-portal=""
696604
id=":r8:"
@@ -699,11 +607,6 @@ exports[`AvatarGroup component snapshot
699607
data-floating-ui-portal=""
700608
id=":rb:"
701609
/>
702-
<<<<<<< HEAD
703-
=======
704-
>>>>>>> b67de59a (feat: migration to react 19)
705-
=======
706-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
707610
</body>,
708611
"container": <div>
709612
<div
@@ -724,14 +627,7 @@ exports[`AvatarGroup component snapshot
724627
<div
725628
aria-expanded="false"
726629
aria-haspopup="dialog"
727-
<<<<<<< HEAD
728-
<<<<<<< HEAD
729630
class="flex-grow-0"
730-
=======
731-
>>>>>>> b67de59a (feat: migration to react 19)
732-
=======
733-
class="flex-grow-0"
734-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
735631
data-state="closed"
736632
triggerclass="flex-grow-0"
737633
>
@@ -773,14 +669,7 @@ exports[`AvatarGroup component snapshot
773669
<div
774670
aria-expanded="false"
775671
aria-haspopup="dialog"
776-
<<<<<<< HEAD
777-
<<<<<<< HEAD
778-
class="flex-grow-0"
779-
=======
780-
>>>>>>> b67de59a (feat: migration to react 19)
781-
=======
782672
class="flex-grow-0"
783-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
784673
data-state="closed"
785674
triggerclass="flex-grow-0"
786675
>
@@ -889,14 +778,7 @@ exports[`AvatarGroup component snapshot
889778
<div
890779
aria-expanded="false"
891780
aria-haspopup="dialog"
892-
<<<<<<< HEAD
893-
<<<<<<< HEAD
894781
class="flex-grow-0"
895-
=======
896-
>>>>>>> b67de59a (feat: migration to react 19)
897-
=======
898-
class="flex-grow-0"
899-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
900782
data-state="closed"
901783
triggerclass="flex-grow-0"
902784
>
@@ -938,14 +820,7 @@ exports[`AvatarGroup component snapshot
938820
<div
939821
aria-expanded="false"
940822
aria-haspopup="dialog"
941-
<<<<<<< HEAD
942-
<<<<<<< HEAD
943-
class="flex-grow-0"
944-
=======
945-
>>>>>>> b67de59a (feat: migration to react 19)
946-
=======
947823
class="flex-grow-0"
948-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
949824
data-state="closed"
950825
triggerclass="flex-grow-0"
951826
>
@@ -975,10 +850,6 @@ exports[`AvatarGroup component snapshot
975850
</div>
976851
</div>
977852
</div>
978-
<<<<<<< HEAD
979-
<<<<<<< HEAD
980-
=======
981-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
982853
<div
983854
data-floating-ui-portal=""
984855
id=":r2:"
@@ -987,11 +858,6 @@ exports[`AvatarGroup component snapshot
987858
data-floating-ui-portal=""
988859
id=":r5:"
989860
/>
990-
<<<<<<< HEAD
991-
=======
992-
>>>>>>> b67de59a (feat: migration to react 19)
993-
=======
994-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
995861
</body>,
996862
"container": <div>
997863
<div
@@ -1012,14 +878,7 @@ exports[`AvatarGroup component snapshot
1012878
<div
1013879
aria-expanded="false"
1014880
aria-haspopup="dialog"
1015-
<<<<<<< HEAD
1016-
<<<<<<< HEAD
1017881
class="flex-grow-0"
1018-
=======
1019-
>>>>>>> b67de59a (feat: migration to react 19)
1020-
=======
1021-
class="flex-grow-0"
1022-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
1023882
data-state="closed"
1024883
triggerclass="flex-grow-0"
1025884
>
@@ -1061,14 +920,7 @@ exports[`AvatarGroup component snapshot
1061920
<div
1062921
aria-expanded="false"
1063922
aria-haspopup="dialog"
1064-
<<<<<<< HEAD
1065-
<<<<<<< HEAD
1066-
class="flex-grow-0"
1067-
=======
1068-
>>>>>>> b67de59a (feat: migration to react 19)
1069-
=======
1070923
class="flex-grow-0"
1071-
>>>>>>> 4a84ed17 (feat(popover): add new popover component)
1072924
data-state="closed"
1073925
triggerclass="flex-grow-0"
1074926
>

0 commit comments

Comments
 (0)