Merge branch 'develop' into feat/focus-first-match

Author: MJRuskin

Diff for: .all-contributorsrc

@@ -273,7 +273,18 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "kYem",
+      "name": "Kestutis Kasiulynas",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3390897?v=4",
+      "profile": "http://kYem.net",
+      "contributions": [
+        "bug",
+        "code"
+      ]
     }
   ],
-  "contributorsPerLine": 7
+  "contributorsPerLine": 7,
+  "skipCi": true
 }

Diff for: .github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  push:
+    branches: [develop, master]
+  pull_request:
+    branches: [develop]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node JS
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - run: yarn install --ignore-engines
+      - run: yarn lint:nofix
+      # 💀💀💀💀cannot run coveralls since GH won't pass COVERALLS_REPO_TOKEN to forks; so any PRs from external contributors would fail
+      # - run: yarn coveralls
+      #   env:
+      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      #     COVERALLS_GIT_BRANCH: ${{ github.ref }}

Diff for: .github/workflows/docs.yml

@@ -0,0 +1,34 @@
+name: Docs
+
+on:
+  push:
+    branches: [develop]
+    paths:
+      - 'docs/**'
+      - package.json
+      - README.md
+
+jobs:
+  build-docs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+      - name: Setup Node JS
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: Build Docs 📚
+        run: |
+          # un-ignore bundle.js
+          mv docs/.gitignore .gitignore
+          yarn install --ignore-engines
+          yarn build:docs
+      - name: Deploy Pages 🚀
+        uses: JamesIves/github-pages-deploy-action@releases/v3
+        with:
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: docs

Diff for: .github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node JS
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - run: yarn install --ignore-engines
+      - run: yarn lint:nofix
+      - run: yarn test
+      - name: Release to npm 🚀
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          yarn add semantic-release
+          yarn semantic-release

Diff for: .travis.yml

@@ -12,35 +12,7 @@ jobs:
       install:
         - yarn install --ignore-engines
       script:
-        - yarn lint:nofix
         - yarn coveralls
       branches:
         except:
           - /^v\d+\.\d+\.\d+$/
-    # Define the release stage that runs semantic-release
-    - stage: release
-      if: (NOT type IN (pull_request)) AND (branch = master)
-      node_js: '10'
-      # overwrite default `script` step to skip the tests
-      script: echo "Deploying to npm ..."
-      deploy:
-        provider: script
-        skip_cleanup: true
-        script:
-          - npx semantic-release
-    - stage: docs
-      if: (NOT type IN (pull_request)) AND (branch = develop)
-      node_js: '10'
-      # un-ignore bundle.js
-      before_deploy: mv docs/.gitignore .gitignore
-      # overwrite default `script` step to skip the tests
-      script: yarn build:docs
-      deploy:
-        provider: pages
-        skip-cleanup: true
-        github-token: $GH_PAGES_TOKEN  # Set in the settings page of the repository, as a secure variable
-        keep-history: true
-        local-dir: docs
-        verbose: true
-        on:
-          branch: develop

Diff for: README.md

@@ -75,15 +75,16 @@ class DropdownTreeSelect extends Component {
       rootPrefixId: this.clientId,
       searchPredicate,
     })
-    // Restore focus-state
-    const currentFocusNode = this.state.currentFocus && this.treeManager.getNodeById(this.state.currentFocus)
-    if (currentFocusNode) {
-      currentFocusNode._focused = true
-    }
-    this.setState(prevState => ({
-      showDropdown: /initial|always/.test(showDropdown) || prevState.showDropdown === true,
-      ...this.treeManager.getTreeAndTags(),
-    }))
+    this.setState(prevState => {
+      const currentFocusNode = prevState.currentFocus && this.treeManager.getNodeById(prevState.currentFocus)
+      if (currentFocusNode) {
+        currentFocusNode._focused = true
+      }
+      return {
+        showDropdown: /initial|always/.test(showDropdown) || prevState.showDropdown === true,
+        ...this.treeManager.getTreeAndTags(),
+      }
+    })
   }
 
   resetSearchState = () => {

Diff for: src/index.js

@@ -316,3 +316,44 @@ test('appends selected tags to aria-labelledby with text label', t => {
   t.deepEqual(wrapper.find('.dropdown-trigger').prop('aria-labelledby'), 'rdts_trigger rdts-0_tag')
   t.deepEqual(wrapper.find('.dropdown-trigger').prop('aria-label'), 'hello world')
 })
+
+test('select correct focused node when using external state data container', t => {
+  let data = [
+    {
+      label: 'All data',
+      value: '0',
+      checked: false,
+    },
+    {
+      label: 'iWay',
+      value: '1',
+      checked: false,
+    },
+  ]
+  const wrapper = mount(<DropdownTreeSelect id={dropdownId} data={data} />)
+  const nodeAllData = {
+    _id: `${dropdownId}-0`,
+    _depth: 0,
+    label: 'All data',
+    value: '0',
+    children: undefined,
+    actions: [action],
+  }
+  wrapper.instance().onCheckboxChange(nodeAllData._id, true)
+  //simulate external change to the data props.
+  wrapper.setProps({
+    data: [
+      {
+        label: 'All data',
+        value: '0',
+        checked: true,
+      },
+      {
+        label: 'iWay',
+        value: '1',
+        checked: false,
+      },
+    ],
+  })
+  t.deepEqual(wrapper.state().currentFocus, nodeAllData._id)
+})