Merge pull request #711 from wordpress-mobile/release/1.0.2

Release v1.0.2
wordpress-mobile · Mar 7, 2019 · 38a42c9 · 38a42c9
2 parents 44f1d99 + b1063f5
commit 38a42c9
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,64 @@
+version: 2.1
+
+commands:
+  yarn-install:
+    steps:
+      - restore_cache:
+          name: Restore Yarn Cache
+          keys:
+            - yarn-{{ checksum "yarn.lock" }}
+      - run:
+          name: Yarn Install
+          command: yarn install --frozen-lockfile
+      - save_cache:
+          name: Save Yarn Cache
+          key: yarn-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+jobs:
+  checks:
+    parameters:
+      platform:
+        type: string
+        default: ""
+      check-tests:
+        type: boolean
+        default: false
+      check-correctness:
+        type: boolean
+        default: false
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - run:
+          name: Checkout Gutenberg
+          command: |
+            git submodule init
+            git submodule update --recursive
+      - yarn-install
+      - run:
+          name: Set Environment Variables
+          command: |
+            echo 'export CHECK_CORRECTNESS=<<parameters.check-correctness>>' >> $BASH_ENV
+            echo 'export CHECK_TESTS=<<parameters.check-tests>>' >> $BASH_ENV
+            echo 'export TEST_RN_PLATFORM=<<parameters.platform>>' >> $BASH_ENV
+      - run:
+          name: Run Checks
+          command: bin/ci-checks-js.sh
+
+workflows:
+  gutenberg-mobile:
+    jobs:
+      - checks:
+          name: Check Correctness
+          check-correctness: true
+      - checks:
+          name: Test iOS
+          platform: ios
+          check-tests: true
+      - checks:
+          name: Test Android
+          platform: android
+          check-tests: true
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
       cache:
         yarn: true
       script:
-        - ./.travis/travis-checks-js.sh
+        - bin/ci-checks-js.sh
     - language: node_js
       node_js: 8
       env:
@@ -21,7 +21,7 @@ matrix:
       cache:
         yarn: true
       script:
-        - ./.travis/travis-checks-js.sh
+        - bin/ci-checks-js.sh
     - language: node_js
       node_js: 8
       env:
@@ -31,4 +31,4 @@ matrix:
       cache:
         yarn: true
       script:
-        - ./.travis/travis-checks-js.sh
+        - bin/ci-checks-js.sh
diff --git a/.travis/travis-checks-js.sh → bin/ci-checks-js.sh b/.travis/travis-checks-js.sh → bin/ci-checks-js.sh
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -267,16 +267,15 @@ class RCTAztecView: Aztec.TextView {
             (start, end) = (end, start)
         }
 
-        var result: [String : Any] = [
-            "text": getHTML(),
-            "selectionStart": start,
-            "selectionEnd": end
-        ]
+        var result: [AnyHashable : Any] = packForRN(getHTML(), withName: "text")
+
+        result["selectionStart"] = start
+        result["selectionEnd"] = end
 
         if let selectedTextRange = selectedTextRange {
             let caretEndRect = caretRect(for: selectedTextRange.end)
             // Sergio Estevao: Sometimes the carectRect can be invalid so we need to check before sending this to JS.
-            if !(caretEndRect.isInfinite || caretEndRect.isEmpty || caretEndRect.isNull) {
+            if !(caretEndRect.isInfinite || caretEndRect.isNull) {
                 result["selectionEndCaretX"] = caretEndRect.origin.x
                 result["selectionEndCaretY"] = caretEndRect.origin.y
             }