[Fix] default skin tone bug

akxcv · Feb 17, 2018 · 96d4c27 · 96d4c27
1 parent ad89e59
commit 96d4c27
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.1] - 2018-02-17
+### Fixed
+- Bug with applying default skin tones to foregrounds / backgrounds consisting of
+more than 1 emoji
+
 ## [1.2.0] - 2018-02-13
 ### Added
 - Feature: default skin tones

diff --git a/krasivo.js b/krasivo.js
@@ -75,17 +75,17 @@ function replaceForegroundAndBackground(string, foreground, background, options)
   var matches, match // temporary storage for regexp matches
 
   if (options.skinTone) {
-    while (matches = EMOJI_WITH_SKIN_COLOUR_REGEXP.exec(foreground)) {
+    while (match = EMOJI_WITH_SKIN_COLOUR_REGEXP.exec(foreground)) {
       // if skin tone is not specified AND the emoji supports skin tones
-      if (matches[2] === undefined && arrayIncludes(emoji.emojiWithSkinVariations, matches[1])) {
-        foreground += ':skin-tone-' + options.skinTone + ':'
+      if (match[2] === undefined && arrayIncludes(emoji.emojiWithSkinVariations, match[1])) {
+        foreground = foreground.replace(match[0], `${match[0]}:skin-tone-${options.skinTone}:`)
       }
     }
 
-    while (matches = EMOJI_WITH_SKIN_COLOUR_REGEXP.exec(background)) {
+    while (match = EMOJI_WITH_SKIN_COLOUR_REGEXP.exec(background)) {
       // if skin tone is not specified AND the emoji supports skin tones
-      if (matches[2] === undefined && arrayIncludes(emoji.emojiWithSkinVariations, matches[1])) {
-        background += ':skin-tone-' + options.skinTone + ':'
+      if (match[2] === undefined && arrayIncludes(emoji.emojiWithSkinVariations, match[1])) {
+        background = background.replace(match[0], `${match[0]}:skin-tone-${options.skinTone}:`)
       }
     }
   }

diff --git a/krasivo.test.js b/krasivo.test.js
@@ -198,5 +198,21 @@ describe('krasivo', () => {
         ].join('\n')
       )
     })
+
+    it('sets default skin tone to all emojis in fg/bg', () => {
+      expect(
+        krasivo('1', ':no_good::thumbsup:', ':wave::thumbsdown:', { skinTone: 2 })
+      ).toBe(
+        [
+          ':wave::skin-tone-2::thumbsdown::skin-tone-2::wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:',
+          ':wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:',
+          ':no_good::skin-tone-2::thumbsup::skin-tone-2::wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:',
+          ':wave::skin-tone-2::thumbsdown::skin-tone-2::wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:',
+          ':wave::skin-tone-2::thumbsdown::skin-tone-2::wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:',
+          ':wave::skin-tone-2::thumbsdown::skin-tone-2::wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:',
+          ':wave::skin-tone-2::thumbsdown::skin-tone-2::wave::skin-tone-2::thumbsdown::skin-tone-2::no_good::skin-tone-2::thumbsup::skin-tone-2:'
+        ].join('\n')
+      )
+    })
   })
 })
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "krasivo",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Alexander Komarov <[email protected]>",
   "license": "MIT",
   "keywords": [