slate 0.67.1 → 0.70.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # slate
 
+## 0.70.0
+
+### Minor Changes
+
+- [#4565](https://github.com/ianstormtaylor/slate/pull/4565) [`5818aca5`](https://github.com/ianstormtaylor/slate/commit/5818aca5038f38465a5769fe944f184be0255341) Thanks [@oliger](https://github.com/oliger)! - Fix issue with unicode 1.1 smileys followed by a variation selector.
+
+### Patch Changes
+
+- [#4638](https://github.com/ianstormtaylor/slate/pull/4638) [`e0f41514`](https://github.com/ianstormtaylor/slate/commit/e0f41514a1e0e866297904be16eff82702e8afd8) Thanks [@e1himself](https://github.com/e1himself)! - Improve typescript type of `props` argument of `Transforms.setNodes()`
+
 ## 0.67.1
 
 ### Patch Changes

package/dist/index.es.js

@@ -462,135 +462,121 @@ var CHAMELEON = /['\u2018\u2019]/;
  * Get the distance to the end of the first character in a string of text.
  */
 
+var CodepointType;
+
+(function (CodepointType) {
+  // ZWJ sequences consist of multiple emojis separated by ZWJ character.  They
+  // are used to combine multiple emojis into one emoji.
+  // https://en.wikipedia.org/wiki/Zero-width_joiner
+  CodepointType[CodepointType["ZeroWidthJoiner"] = 0] = "ZeroWidthJoiner"; // Kecap sequences consit of a digit, an asterisk or a number sign followed by
+  // the Combining Enclosing Keycap character. They are used to create emoji
+  // with a keycap appearance.  https://emojipedia.org/emoji-keycap-sequence
+
+  CodepointType[CodepointType["Keycap"] = 1] = "Keycap"; // Modifiers are used in ZWJ sequences to apply a skin tone to an emoji.
+  // https://en.wikipedia.org/wiki/Emoticons_(Unicode_block)#Emoji_modifiers
+
+  CodepointType[CodepointType["Modifier"] = 2] = "Modifier"; // Variation selectors are used to specify if a character should be displayed
+  // as text or as an emoji.
+
+  CodepointType[CodepointType["VariationSelector"] = 3] = "VariationSelector"; // Flag sequences consist of a pair of regional indicators.
+  // https://en.wikipedia.org/wiki/Regional_indicator_symbol
+
+  CodepointType[CodepointType["RegionalIndicator"] = 4] = "RegionalIndicator"; // Tag sequences consist of a Black Flag emoji followed by a series of Tag
+  // codepoints, then the Cancel Tag codepoint.
+  // https://en.wikipedia.org/wiki/Tags_(Unicode_block)
+
+  CodepointType[CodepointType["Tag"] = 5] = "Tag";
+  CodepointType[CodepointType["Character"] = 6] = "Character";
+})(CodepointType || (CodepointType = {}));
+
 var getCharacterDistance = function getCharacterDistance(str) {
   var isRTL = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var codepoints = isRTL ? codepointsIteratorRTL(str) : str;
   var isLTR = !isRTL;
-  var dist = 0; // prev types:
-  // NSEQ: non sequenceable codepoint.
-  // MOD: modifier
-  // ZWJ: zero width joiner
-  // VAR: variation selector
-  // BMP: sequenceable codepoint from basic multilingual plane
-  // RI: regional indicator
-  // KC: keycap
-  // TAG: tag
-
-  var prev = null;
-  var codepoints = isLTR ? str : codepointsIteratorRTL(str);
+  var [isKeycapStart, isKeycapEnd, isTagStart, isTagEnd] = isLTR ? [isKeycap, isCombiningEnclosingKeycap, isBlackFlag, isCancelTag] : [isCombiningEnclosingKeycap, isKeycap, isCancelTag, isBlackFlag];
+  var distance = 0;
+  var previousType = null;
 
   for (var codepoint of codepoints) {
     var code = codepoint.codePointAt(0);
-    if (!code) break; // Check if codepoint is part of a sequence.
+    if (!code) break;
+
+    if (isLTR && previousType === CodepointType.VariationSelector && !isZWJ(code) && !isKeycapEnd(code)) {
+      break;
+    }
 
     if (isZWJ(code)) {
-      dist += codepoint.length;
-      prev = 'ZWJ';
+      distance += codepoint.length;
+      previousType = CodepointType.ZeroWidthJoiner;
       continue;
     }
 
-    var [isKeycapStart, isKeycapEnd] = isLTR ? [isKeycap, isCombiningEnclosingKeycap] : [isCombiningEnclosingKeycap, isKeycap];
-
     if (isKeycapStart(code)) {
-      if (prev === 'KC') {
-        break;
-      }
-
-      dist += codepoint.length;
-      prev = 'KC';
+      if (previousType === CodepointType.Keycap) break;
+      distance += codepoint.length;
+      previousType = CodepointType.Keycap;
       continue;
     }
 
     if (isKeycapEnd(code)) {
-      dist += codepoint.length;
+      distance += codepoint.length;
       break;
     }
 
     if (isVariationSelector(code)) {
-      dist += codepoint.length;
-
-      if (isLTR && prev === 'BMP') {
-        break;
-      }
-
-      prev = 'VAR';
-      continue;
-    }
-
-    if (isBMPEmoji(code)) {
-      if (isLTR && prev && prev !== 'ZWJ' && prev !== 'VAR') {
-        break;
-      }
-
-      dist += codepoint.length;
-
-      if (isRTL && prev === 'VAR') {
-        break;
-      }
-
-      prev = 'BMP';
+      if (isRTL && previousType === CodepointType.Character) break;
+      distance += codepoint.length;
+      previousType = CodepointType.VariationSelector;
       continue;
     }
 
     if (isModifier(code)) {
-      dist += codepoint.length;
-      prev = 'MOD';
+      distance += codepoint.length;
+      previousType = CodepointType.Modifier;
       continue;
     }
 
-    var [isTagStart, isTagEnd] = isLTR ? [isBlackFlag, isCancelTag] : [isCancelTag, isBlackFlag];
-
     if (isTagStart(code)) {
-      if (prev === 'TAG') break;
-      dist += codepoint.length;
-      prev = 'TAG';
+      if (previousType === CodepointType.Tag) break;
+      distance += codepoint.length;
+      previousType = CodepointType.Tag;
       continue;
     }
 
-    if (isTagEnd(code)) {
-      dist += codepoint.length;
-      break;
-    }
-
-    if (prev === 'TAG' && isTag(code)) {
-      dist += codepoint.length;
-      continue;
-    }
-
-    if (isRegionalIndicator(code)) {
-      dist += codepoint.length;
-
-      if (prev === 'RI') {
+    if (previousType === CodepointType.Tag) {
+      if (isTagEnd(code)) {
+        distance += codepoint.length;
         break;
       }
 
-      prev = 'RI';
-      continue;
+      if (isTag(code)) {
+        distance += codepoint.length;
+        continue;
+      }
+
+      break;
     }
 
-    if (!isBMP(code)) {
-      // If previous code point is not sequenceable, it means we are not in a
-      // sequence.
-      if (prev === 'NSEQ') {
+    if (isRegionalIndicator(code)) {
+      if (previousType && previousType !== CodepointType.RegionalIndicator) {
         break;
       }
 
-      dist += codepoint.length;
-      prev = 'NSEQ';
+      distance += codepoint.length;
+      if (previousType === CodepointType.RegionalIndicator) break;
+      previousType = CodepointType.RegionalIndicator;
       continue;
-    } // Modifier 'groups up' with what ever character is before that (even whitespace), need to
-    // look ahead.
+    } // If previous and curent codepoints are regular characters. it means we are
+    // not in a sequence.
 
 
-    if (isLTR && prev === 'MOD') {
-      dist += codepoint.length;
-      break;
-    } // If while loop ever gets here, we're done (e.g latin chars).
-
-
-    break;
+    if (previousType === CodepointType.Character) break;
+    distance += codepoint.length;
+    previousType = CodepointType.Character;
+    continue;
   }
 
-  return dist || 1;
+  return distance || 1;
 };
 /**
  * Get the distance to the end of the first word in a string of text.
@@ -703,41 +689,6 @@ var isKeycap = code => {
 var isCombiningEnclosingKeycap = code => {
   return code === 0x20e3;
 };
-/**
- * Is `code` one of the BMP codes used in emoji sequences.
- *
- * https://emojipedia.org/emoji-zwj-sequences/
- */
-
-
-var isBMPEmoji = code => {
-  // This requires tiny bit of maintanance, better ideas?
-  // Fortunately it only happens if new Unicode Standard
-  // is released. Fails gracefully if upkeep lags behind,
-  // same way Slate previously behaved with all emojis.
-  return code === 0x2764 || // heart (❤)
-  code === 0x2642 || // male (♂)
-  code === 0x2640 || // female (♀)
-  code === 0x2620 || // scull (☠)
-  code === 0x2695 || // medical (⚕)
-  code === 0x2708 || // plane (✈️)
-  code === 0x25ef || // large circle (◯)
-  code === 0x2b06 || // up arrow (⬆)
-  code === 0x2197 || // up-right arrow (↗)
-  code === 0x27a1 || // right arrow (➡)
-  code === 0x2198 || // down-right arrow (↘)
-  code === 0x2b07 || // down arrow (⬇)
-  code === 0x2199 || // down-left arrow (↙)
-  code === 0x2b05 || // left arrow (⬅)
-  code === 0x2196 || // up-left arrow (↖)
-  code === 0x2195 || // up-down arrow (↕)
-  code === 0x2194 || // left-right arrow (↔)
-  code === 0x21a9 || // right arrow curving left (↩)
-  code === 0x21aa || // left arrow curving right (↪)
-  code === 0x2934 || // right arrow curving up (⤴)
-  code === 0x2935 // right arrow curving down (⤵)
-  ;
-};
 /**
  * Is `code` a Regional Indicator.
  *
@@ -748,16 +699,6 @@ var isBMPEmoji = code => {
 var isRegionalIndicator = code => {
   return code >= 0x1f1e6 && code <= 0x1f1ff;
 };
-/**
- * Is `code` from basic multilingual plane.
- *
- * https://codepoints.net/basic_multilingual_plane
- */
-
-
-var isBMP = code => {
-  return code <= 0xffff;
-};
 /**
  * Is `code` a Zero Width Joiner.
  *