From 572d56f194aca19581102228ffea2bfd1168f4ee Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Tue, 24 May 2022 13:34:57 +0300 Subject: [PATCH 01/19] =?UTF-8?q?Problem=20Aria-live=20of=20TreeSelect=20o?= =?UTF-8?q?ption=20was=20always=20updated=20with=20the=20value=20of=20the?= =?UTF-8?q?=20option.=20In=20some=20cases=20there=20is=20some=20sort=20of?= =?UTF-8?q?=20ID=20in=20the=20value=20field=20(not=20relevant=20for=20user?= =?UTF-8?q?),=20and=20the=20textual=20representation=20in=20label.=20In=20?= =?UTF-8?q?those=20cases,=20users=20with=20screenreaders=20are=20confused,?= =?UTF-8?q?=20as=20they=20hear=20only=20some=20ID-numbers=20instead=20of?= =?UTF-8?q?=20option=20labels.=20This=20is=20a=20huge=20problem=20for=20ac?= =?UTF-8?q?cessibility.=20Solution=20Allow=20developer=20to=20decide=20whe?= =?UTF-8?q?ther=20to=20use=20option=20label=20in=20aria-live=20area.=20The?= =?UTF-8?q?re=20is=20a=20new=20prop=20=C2=B4bool=20labelInAriaLive=20(defa?= =?UTF-8?q?ult=3Dfalse)=C2=B4=20,=20that=20the=20developer=20can=20use=20i?= =?UTF-8?q?f=20he/she=20wishes.=20This=20is=20a=20huge=20enabler=20for=20i?= =?UTF-8?q?mproving=20accessibility.=20Notes=20Also=20testcase=20was=20add?= =?UTF-8?q?ed=20and=20documentation=20was=20updated=20in=20this=20commit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit will not break any existing usage of treeSelect component, as the default for new prop is false. If ´labelInAriaLive´ is false, everything will work as expected. --- README.md | 1 + src/OptionList.tsx | 15 ++++++++------- src/TreeSelect.tsx | 38 +++++++++++++++++++++----------------- src/TreeSelectContext.ts | 3 ++- tests/Select.props.spec.js | 37 ++++++++++++++++++++++++++++++++++++- 5 files changed, 68 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 71313b88..76aaee07 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ online example: https://tree-select-react-component.vercel.app/ |defaultValue | initial selected treeNode(s) | same as value type | - | |value | current selected treeNode(s). | normal: String/Array. labelInValue: {value:String,label:React.Node}/Array<{value,label}>. treeCheckStrictly(halfChecked default false): {value:String,label:React.Node, halfChecked}/Array<{value,label,halfChecked}>. | - | |labelInValue| whether to embed label in value, see above value type | Bool | false | +|labelInAriaLive| whether to use option label instead of value for screenreader | Bool | false | |onChange | called when select treeNode or input value change | function(value, label(null), extra) | - | |onSelect | called when select treeNode | function(value, node, extra) | - | |onSearch | called when input changed | function | - | diff --git a/src/OptionList.tsx b/src/OptionList.tsx index f0cb4121..b5402dbe 100644 --- a/src/OptionList.tsx +++ b/src/OptionList.tsx @@ -1,12 +1,12 @@ -import * as React from 'react'; -import KeyCode from 'rc-util/lib/KeyCode'; -import useMemo from 'rc-util/lib/hooks/useMemo'; -import type { RefOptionListProps } from 'rc-select/lib/OptionList'; import { useBaseProps } from 'rc-select'; -import type { TreeProps } from 'rc-tree'; +import type { RefOptionListProps } from 'rc-select/lib/OptionList'; import Tree from 'rc-tree'; +import type { TreeProps } from 'rc-tree'; import type { EventDataNode, ScrollTo } from 'rc-tree/lib/interface'; -import type { TreeDataNode, Key } from './interface'; +import useMemo from 'rc-util/lib/hooks/useMemo'; +import KeyCode from 'rc-util/lib/KeyCode'; +import * as React from 'react'; +import type { Key, TreeDataNode } from './interface'; import LegacyContext from './LegacyContext'; import TreeSelectContext from './TreeSelectContext'; import { getAllKeys, isCheckDisabled } from './utils/valueUtil'; @@ -42,6 +42,7 @@ const OptionList: React.RefForwardingComponent = (_, r onSelect, dropdownMatchSelectWidth, treeExpandAction, + labelInAriaLive, } = React.useContext(TreeSelectContext); const { @@ -211,7 +212,7 @@ const OptionList: React.RefForwardingComponent = (_, r
{activeEntity && open && ( - {activeEntity.node.value} + {!labelInAriaLive ? activeEntity.node.value : activeEntity.node.label} )} diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx index 4600481d..03c99011 100644 --- a/src/TreeSelect.tsx +++ b/src/TreeSelect.tsx @@ -1,33 +1,33 @@ -import * as React from 'react'; import { BaseSelect } from 'rc-select'; -import type { IconType } from 'rc-tree/lib/interface'; -import type { ExpandAction } from 'rc-tree/lib/Tree'; import type { - BaseSelectRef, - BaseSelectPropsWithoutPrivate, BaseSelectProps, + BaseSelectPropsWithoutPrivate, + BaseSelectRef, SelectProps, } from 'rc-select'; -import { conductCheck } from 'rc-tree/lib/utils/conductUtil'; import useId from 'rc-select/lib/hooks/useId'; +import type { IconType } from 'rc-tree/lib/interface'; +import type { ExpandAction } from 'rc-tree/lib/Tree'; +import { conductCheck } from 'rc-tree/lib/utils/conductUtil'; import useMergedState from 'rc-util/lib/hooks/useMergedState'; +import warning from 'rc-util/lib/warning'; +import * as React from 'react'; +import useCache from './hooks/useCache'; +import useCheckedKeys from './hooks/useCheckedKeys'; +import useDataEntities from './hooks/useDataEntities'; +import useFilterTreeData from './hooks/useFilterTreeData'; +import useRefFunc from './hooks/useRefFunc'; +import useTreeData from './hooks/useTreeData'; +import LegacyContext from './LegacyContext'; import OptionList from './OptionList'; import TreeNode from './TreeNode'; -import { formatStrategyValues, SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from './utils/strategyUtil'; -import type { CheckedStrategy } from './utils/strategyUtil'; import TreeSelectContext from './TreeSelectContext'; import type { TreeSelectContextProps } from './TreeSelectContext'; -import LegacyContext from './LegacyContext'; -import useTreeData from './hooks/useTreeData'; -import { toArray, fillFieldNames, isNil } from './utils/valueUtil'; -import useCache from './hooks/useCache'; -import useRefFunc from './hooks/useRefFunc'; -import useDataEntities from './hooks/useDataEntities'; import { fillAdditionalInfo, fillLegacyProps } from './utils/legacyUtil'; -import useCheckedKeys from './hooks/useCheckedKeys'; -import useFilterTreeData from './hooks/useFilterTreeData'; +import { formatStrategyValues, SHOW_ALL, SHOW_CHILD, SHOW_PARENT } from './utils/strategyUtil'; +import type { CheckedStrategy } from './utils/strategyUtil'; +import { fillFieldNames, isNil, toArray } from './utils/valueUtil'; import warningProps from './utils/warningPropsUtil'; -import warning from 'rc-util/lib/warning'; export type OnInternalSelect = (value: RawValueType, info: { selected: boolean }) => void; @@ -140,6 +140,7 @@ export interface TreeSelectProps< treeCheckable?: boolean | React.ReactNode; treeCheckStrictly?: boolean; labelInValue?: boolean; + labelInAriaLive?: boolean; // >>> Data treeData?: OptionType[]; @@ -202,6 +203,7 @@ const TreeSelect = React.forwardRef((props, ref) treeCheckable, treeCheckStrictly, labelInValue, + labelInAriaLive, // FieldNames fieldNames, @@ -651,6 +653,7 @@ const TreeSelect = React.forwardRef((props, ref) fieldNames: mergedFieldNames, onSelect: onOptionSelect, treeExpandAction, + labelInAriaLive, }), [ virtual, @@ -661,6 +664,7 @@ const TreeSelect = React.forwardRef((props, ref) mergedFieldNames, onOptionSelect, treeExpandAction, + labelInAriaLive, ], ); diff --git a/src/TreeSelectContext.ts b/src/TreeSelectContext.ts index 0cb40e0f..cc76375b 100644 --- a/src/TreeSelectContext.ts +++ b/src/TreeSelectContext.ts @@ -1,5 +1,5 @@ -import * as React from 'react'; import type { ExpandAction } from 'rc-tree/lib/Tree'; +import * as React from 'react'; import type { DefaultOptionType, InternalFieldName, OnInternalSelect } from './TreeSelect'; export interface TreeSelectContextProps { @@ -11,6 +11,7 @@ export interface TreeSelectContextProps { fieldNames: InternalFieldName; onSelect: OnInternalSelect; treeExpandAction?: ExpandAction; + labelInAriaLive?: boolean; } const TreeSelectContext = React.createContext(null as any); diff --git a/tests/Select.props.spec.js b/tests/Select.props.spec.js index b1fff014..8258505e 100644 --- a/tests/Select.props.spec.js +++ b/tests/Select.props.spec.js @@ -1,7 +1,8 @@ /* eslint-disable no-undef, react/no-multi-comp, no-console */ -import React from 'react'; import { mount } from 'enzyme'; import Tree, { TreeNode } from 'rc-tree'; +import KeyCode from 'rc-util/lib/KeyCode'; +import React from 'react'; import TreeSelect, { SHOW_ALL, SHOW_CHILD, SHOW_PARENT, TreeNode as SelectNode } from '../src'; // Promisify timeout to let jest catch works @@ -155,6 +156,40 @@ describe('TreeSelect.props', () => { ); }); + it('labelInAriaLive', () => { + function keyDown(code) { + wrapper.find('input').first().simulate('keyDown', { which: code }); + wrapper.update(); + } + + function keyUp(code) { + wrapper.find('input').first().simulate('keyUp', { which: code }); + wrapper.update(); + } + + const wrapper = mount( + , + ); + + wrapper.openSelect(); + keyDown(KeyCode.DOWN); + keyUp(KeyCode.DOWN); + + const ariaLiveSpan = wrapper.find('[aria-live="assertive"]'); + expect(ariaLiveSpan.text()).toEqual('parent-label'); + }); + it('set illegal value', () => { const wrapper = mount( createSelect({ From 6fd6b986cc452123ed1ffe076893ebef6fd0a9db Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Tue, 24 May 2022 13:34:57 +0300 Subject: [PATCH 02/19] Problem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aria-live of TreeSelect option was always updated with the value of the option. In some cases there is some sort of ID in the value field (not relevant for user), and the textual representation in label. In those cases, users with screenreaders are confused, as they hear only some ID-numbers instead of option labels. This is a huge problem for accessibility. Solution Allow developer to decide whether to use option label in aria-live area. There is a new prop ´bool labelInAriaLive (default=false)´ , that the developer can use if he/she wishes. This is a huge enabler for improving accessibility. Notes Also testcase was added and documentation was updated in this commit. This commit will not break any existing usage of treeSelect component, as the default for new prop is false. If ´labelInAriaLive´ is false, everything will work as expected. --- README.md | 1 + src/OptionList.tsx | 15 ++++++++------- src/TreeSelect.tsx | 38 +++++++++++++++++++++----------------- src/TreeSelectContext.ts | 3 ++- tests/Select.props.spec.js | 37 ++++++++++++++++++++++++++++++++++++- 5 files changed, 68 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 71313b88..76aaee07 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ online example: https://tree-select-react-component.vercel.app/ |defaultValue | initial selected treeNode(s) | same as value type | - | |value | current selected treeNode(s). | normal: String/Array. labelInValue: {value:String,label:React.Node}/Array<{value,label}>. treeCheckStrictly(halfChecked default false): {value:String,label:React.Node, halfChecked}/Array<{value,label,halfChecked}>. | - | |labelInValue| whether to embed label in value, see above value type | Bool | false | +|labelInAriaLive| whether to use option label instead of value for screenreader | Bool | false | |onChange | called when select treeNode or input value change | function(value, label(null), extra) | - | |onSelect | called when select treeNode | function(value, node, extra) | - | |onSearch | called when input changed | function | - | diff --git a/src/OptionList.tsx b/src/OptionList.tsx index f0cb4121..b5402dbe 100644 --- a/src/OptionList.tsx +++ b/src/OptionList.tsx @@ -1,12 +1,12 @@ -import * as React from 'react'; -import KeyCode from 'rc-util/lib/KeyCode'; -import useMemo from 'rc-util/lib/hooks/useMemo'; -import type { RefOptionListProps } from 'rc-select/lib/OptionList'; import { useBaseProps } from 'rc-select'; -import type { TreeProps } from 'rc-tree'; +import type { RefOptionListProps } from 'rc-select/lib/OptionList'; import Tree from 'rc-tree'; +import type { TreeProps } from 'rc-tree'; import type { EventDataNode, ScrollTo } from 'rc-tree/lib/interface'; -import type { TreeDataNode, Key } from './interface'; +import useMemo from 'rc-util/lib/hooks/useMemo'; +import KeyCode from 'rc-util/lib/KeyCode'; +import * as React from 'react'; +import type { Key, TreeDataNode } from './interface'; import LegacyContext from './LegacyContext'; import TreeSelectContext from './TreeSelectContext'; import { getAllKeys, isCheckDisabled } from './utils/valueUtil'; @@ -42,6 +42,7 @@ const OptionList: React.RefForwardingComponent = (_, r onSelect, dropdownMatchSelectWidth, treeExpandAction, + labelInAriaLive, } = React.useContext(TreeSelectContext); const { @@ -211,7 +212,7 @@ const OptionList: React.RefForwardingComponent = (_, r
{activeEntity && open && ( - {activeEntity.node.value} + {!labelInAriaLive ? activeEntity.node.value : activeEntity.node.label} )} diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx index 4600481d..03c99011 100644 --- a/src/TreeSelect.tsx +++ b/src/TreeSelect.tsx @@ -1,33 +1,33 @@ -import * as React from 'react'; import { BaseSelect } from 'rc-select'; -import type { IconType } from 'rc-tree/lib/interface'; -import type { ExpandAction } from 'rc-tree/lib/Tree'; import type { - BaseSelectRef, - BaseSelectPropsWithoutPrivate, BaseSelectProps, + BaseSelectPropsWithoutPrivate, + BaseSelectRef, SelectProps, } from 'rc-select'; -import { conductCheck } from 'rc-tree/lib/utils/conductUtil'; import useId from 'rc-select/lib/hooks/useId'; +import type { IconType } from 'rc-tree/lib/interface'; +import type { ExpandAction } from 'rc-tree/lib/Tree'; +import { conductCheck } from 'rc-tree/lib/utils/conductUtil'; import useMergedState from 'rc-util/lib/hooks/useMergedState'; +import warning from 'rc-util/lib/warning'; +import * as React from 'react'; +import useCache from './hooks/useCache'; +import useCheckedKeys from './hooks/useCheckedKeys'; +import useDataEntities from './hooks/useDataEntities'; +import useFilterTreeData from './hooks/useFilterTreeData'; +import useRefFunc from './hooks/useRefFunc'; +import useTreeData from './hooks/useTreeData'; +import LegacyContext from './LegacyContext'; import OptionList from './OptionList'; import TreeNode from './TreeNode'; -import { formatStrategyValues, SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from './utils/strategyUtil'; -import type { CheckedStrategy } from './utils/strategyUtil'; import TreeSelectContext from './TreeSelectContext'; import type { TreeSelectContextProps } from './TreeSelectContext'; -import LegacyContext from './LegacyContext'; -import useTreeData from './hooks/useTreeData'; -import { toArray, fillFieldNames, isNil } from './utils/valueUtil'; -import useCache from './hooks/useCache'; -import useRefFunc from './hooks/useRefFunc'; -import useDataEntities from './hooks/useDataEntities'; import { fillAdditionalInfo, fillLegacyProps } from './utils/legacyUtil'; -import useCheckedKeys from './hooks/useCheckedKeys'; -import useFilterTreeData from './hooks/useFilterTreeData'; +import { formatStrategyValues, SHOW_ALL, SHOW_CHILD, SHOW_PARENT } from './utils/strategyUtil'; +import type { CheckedStrategy } from './utils/strategyUtil'; +import { fillFieldNames, isNil, toArray } from './utils/valueUtil'; import warningProps from './utils/warningPropsUtil'; -import warning from 'rc-util/lib/warning'; export type OnInternalSelect = (value: RawValueType, info: { selected: boolean }) => void; @@ -140,6 +140,7 @@ export interface TreeSelectProps< treeCheckable?: boolean | React.ReactNode; treeCheckStrictly?: boolean; labelInValue?: boolean; + labelInAriaLive?: boolean; // >>> Data treeData?: OptionType[]; @@ -202,6 +203,7 @@ const TreeSelect = React.forwardRef((props, ref) treeCheckable, treeCheckStrictly, labelInValue, + labelInAriaLive, // FieldNames fieldNames, @@ -651,6 +653,7 @@ const TreeSelect = React.forwardRef((props, ref) fieldNames: mergedFieldNames, onSelect: onOptionSelect, treeExpandAction, + labelInAriaLive, }), [ virtual, @@ -661,6 +664,7 @@ const TreeSelect = React.forwardRef((props, ref) mergedFieldNames, onOptionSelect, treeExpandAction, + labelInAriaLive, ], ); diff --git a/src/TreeSelectContext.ts b/src/TreeSelectContext.ts index 0cb40e0f..cc76375b 100644 --- a/src/TreeSelectContext.ts +++ b/src/TreeSelectContext.ts @@ -1,5 +1,5 @@ -import * as React from 'react'; import type { ExpandAction } from 'rc-tree/lib/Tree'; +import * as React from 'react'; import type { DefaultOptionType, InternalFieldName, OnInternalSelect } from './TreeSelect'; export interface TreeSelectContextProps { @@ -11,6 +11,7 @@ export interface TreeSelectContextProps { fieldNames: InternalFieldName; onSelect: OnInternalSelect; treeExpandAction?: ExpandAction; + labelInAriaLive?: boolean; } const TreeSelectContext = React.createContext(null as any); diff --git a/tests/Select.props.spec.js b/tests/Select.props.spec.js index b1fff014..8258505e 100644 --- a/tests/Select.props.spec.js +++ b/tests/Select.props.spec.js @@ -1,7 +1,8 @@ /* eslint-disable no-undef, react/no-multi-comp, no-console */ -import React from 'react'; import { mount } from 'enzyme'; import Tree, { TreeNode } from 'rc-tree'; +import KeyCode from 'rc-util/lib/KeyCode'; +import React from 'react'; import TreeSelect, { SHOW_ALL, SHOW_CHILD, SHOW_PARENT, TreeNode as SelectNode } from '../src'; // Promisify timeout to let jest catch works @@ -155,6 +156,40 @@ describe('TreeSelect.props', () => { ); }); + it('labelInAriaLive', () => { + function keyDown(code) { + wrapper.find('input').first().simulate('keyDown', { which: code }); + wrapper.update(); + } + + function keyUp(code) { + wrapper.find('input').first().simulate('keyUp', { which: code }); + wrapper.update(); + } + + const wrapper = mount( + , + ); + + wrapper.openSelect(); + keyDown(KeyCode.DOWN); + keyUp(KeyCode.DOWN); + + const ariaLiveSpan = wrapper.find('[aria-live="assertive"]'); + expect(ariaLiveSpan.text()).toEqual('parent-label'); + }); + it('set illegal value', () => { const wrapper = mount( createSelect({ From 59fedd08fb2d00a255726c7ec58ced10a6942ce4 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 08:57:38 +0300 Subject: [PATCH 03/19] package metadata --- .gitignore | 1 + package.json | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 22062024..239c6dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ lib/* coverage yarn.lock package-lock.json +.npmrc es/* # umi .umi diff --git a/package.json b/package.json index 9b70510b..2ca52cef 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,21 @@ { - "name": "rc-tree-select", + "name": "rc-tree-select-custom", "version": "5.4.0", - "description": "tree-select ui component for react", + "description": "custom fork of tree-select ui component for react", "keywords": [ "react", "react-component", "react-tree-select", "tree-select" ], - "homepage": "https://github.com/react-component/tree-select", - "author": "smith3816@gmail.com", + "homepage": "https://github.com/juhoValkonen/tree-select", + "author": "valkonen.juho@gmail.com", "repository": { "type": "git", - "url": "https://github.com/react-component/tree-select.git" + "url": "https://github.com/juhoValkonen/tree-select.git" }, "bugs": { - "url": "https://github.com/react-component/tree-select/issues" + "url": "https://github.com/juhoValkonen/tree-select/issues" }, "files": [ "es", From 134af14f915a21494dcdc92e1972dd8417b10a70 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 08:58:04 +0300 Subject: [PATCH 04/19] 5.4.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ca52cef..27bff7d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree-select-custom", - "version": "5.4.0", + "version": "5.4.1", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From 82452165effd419727cff424cb910208363f051f Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 09:08:54 +0300 Subject: [PATCH 05/19] 5.4.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27bff7d5..c2c905ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree-select-custom", - "version": "5.4.1", + "version": "5.4.2", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From 64f2aea1238422927949f5b709dc00f933240fff Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 09:12:26 +0300 Subject: [PATCH 06/19] Package metadata --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c2c905ac..e6e4dfe2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "rc-tree-select-custom", + "name": "rc-tree-select-accessible", "version": "5.4.2", - "description": "custom fork of tree-select ui component for react", + "description": "Custom fork of tree-select ui component for react", "keywords": [ "react", "react-component", From 0d4440446da5c47ab7c138250af13fdeb437ba30 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 09:12:54 +0300 Subject: [PATCH 07/19] 5.4.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6e4dfe2..b7d16aaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree-select-accessible", - "version": "5.4.2", + "version": "5.4.3", "description": "Custom fork of tree-select ui component for react", "keywords": [ "react", From d68b2ab63810312c8b4e09d95985476c93cac077 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 09:16:10 +0300 Subject: [PATCH 08/19] 5.4.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7d16aaf..2e30f14d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree-select-accessible", - "version": "5.4.3", + "version": "5.4.4", "description": "Custom fork of tree-select ui component for react", "keywords": [ "react", From 8b252f1343125fc9c26d7212710ba42ce7823208 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:01:36 +0300 Subject: [PATCH 09/19] Updated package name --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2e30f14d..880414c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "rc-tree-select-accessible", - "version": "5.4.4", - "description": "Custom fork of tree-select ui component for react", + "name": "@juhovalkonen/rc-tree-select", + "version": "5.4.1", + "description": "custom fork of tree-select ui component for react", "keywords": [ "react", "react-component", From 37c01c58e965097431d53e078720fd688e6bef09 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:02:05 +0300 Subject: [PATCH 10/19] 5.4.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 880414c5..5bd9cf35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.4.1", + "version": "5.4.2", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From 9b6a12c8c2b2142992536457998a8705b69b4e93 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:02:48 +0300 Subject: [PATCH 11/19] Updated package name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bd9cf35..e9ad1956 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.4.2", + "version": "5.4.3", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From bbfbf182bd269f6133579b7eaf65c8e7febcb8bb Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:03:58 +0300 Subject: [PATCH 12/19] 5.4.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9ad1956..ebde2e8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.4.3", + "version": "5.4.5", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From 56807bf6554da5d004b8e874ade21aca3ef10fca Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:06:28 +0300 Subject: [PATCH 13/19] 5.4.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ebde2e8b..8c47c3e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.4.5", + "version": "5.4.6", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From 512b26353a9ba92b204d0c5b6460e983d41fc364 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:15:07 +0300 Subject: [PATCH 14/19] Updated package metadata --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c47c3e5..427bb88e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.4.6", + "private": false, + "version": "5.4.3", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From d23f40d14f8ace413f7e48e20ed1e6092b51ae42 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:16:52 +0300 Subject: [PATCH 15/19] 5.5.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 427bb88e..b4fdc8e0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@juhovalkonen/rc-tree-select", - "private": false, - "version": "5.4.3", + "private": false, + "version": "5.5.0", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", From 596a3cace8fad4b3c0658f34136dae4e59907abe Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:19:45 +0300 Subject: [PATCH 16/19] Updated package metadata --- package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b4fdc8e0..508038cf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "private": false, - "version": "5.5.0", + "version": "5.4.3", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", @@ -18,6 +17,10 @@ "bugs": { "url": "https://github.com/juhoValkonen/tree-select/issues" }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, "files": [ "es", "lib", From 77c536147c1bfc9915453fb2a90541cbfa7ca24b Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Thu, 28 Jul 2022 13:20:18 +0300 Subject: [PATCH 17/19] 5.5.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 508038cf..33816f4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.4.3", + "version": "5.5.1", "description": "custom fork of tree-select ui component for react", "keywords": [ "react", @@ -17,7 +17,7 @@ "bugs": { "url": "https://github.com/juhoValkonen/tree-select/issues" }, - "publishConfig": { + "publishConfig": { "registry": "https://registry.npmjs.org/", "access": "public" }, From 5b4275e4865cb4a2e59eec7c19452bcc479dd688 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Fri, 29 Jul 2022 08:29:22 +0300 Subject: [PATCH 18/19] Bugfix to OptionList.tsx --- src/OptionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OptionList.tsx b/src/OptionList.tsx index b5402dbe..7c578f61 100644 --- a/src/OptionList.tsx +++ b/src/OptionList.tsx @@ -212,7 +212,7 @@ const OptionList: React.RefForwardingComponent = (_, r
{activeEntity && open && ( - {!labelInAriaLive ? activeEntity.node.value : activeEntity.node.label} + {!labelInAriaLive ? activeEntity.node.value : activeEntity.node.title} )} From 82028b3c01c4b78e7c0f055cf31766301567bab9 Mon Sep 17 00:00:00 2001 From: Juho Valkonen Date: Fri, 29 Jul 2022 08:32:29 +0300 Subject: [PATCH 19/19] 5.5.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33816f4b..4bb3818b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@juhovalkonen/rc-tree-select", - "version": "5.5.1", + "version": "5.5.2", "description": "custom fork of tree-select ui component for react", "keywords": [ "react",