feat(emojis): fixing function to fill multiple emojis and colors from…

… theme
mateoguzmana · Aug 20, 2022 · ff38c17 · ff38c17
1 parent 82867cd
commit ff38c17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -132,7 +132,7 @@ function App() {
 
         <TouchableOpacity
           onPress={() =>
-            setComponentToRender(<EmojiPopper emojis={['😀', '😅']} />)
+            setComponentToRender(<EmojiPopper emojis={['😀', '😊']} />)
           }
           style={styles.pressable}
         >

diff --git a/src/utils/colors.ts b/src/utils/colors.ts
@@ -6,11 +6,11 @@ export function colorsFromTheme(theme: string[], itemsToRender: number) {
 
   const randomisedColors = shuffleArray(theme);
 
-  new Array(itemsToRender).fill(0).map((_, index) => {
-    if (index >= randomisedColors.length) {
+  new Array(itemsToRender).fill(0).map(() => {
+    if (colorToPushIndex === randomisedColors.length - 1) {
       colorToPushIndex = 0;
     } else {
-      colorToPushIndex = index;
+      colorToPushIndex++;
     }
 
     newColors.push(randomisedColors[colorToPushIndex]);

diff --git a/src/utils/emojis.ts b/src/utils/emojis.ts
@@ -9,11 +9,11 @@ export function getEmojisToRender(
 
   const randomisedItems = shuffleArray(emojis);
 
-  new Array(itemsToRender).fill(0).map((_, index) => {
-    if (index >= randomisedItems.length) {
+  new Array(itemsToRender).fill(0).map(() => {
+    if (emojiToPushIndex === randomisedItems.length - 1) {
       emojiToPushIndex = 0;
     } else {
-      emojiToPushIndex = index;
+      emojiToPushIndex++;
     }
 
     newEmojis.push(randomisedItems[emojiToPushIndex]);