드랍다운 ariahidden값 true일때 children role 값 none처리건.
This commit is contained in:
@@ -1,5 +1,9 @@
|
|||||||
|
diff --git a/node_modules/@enact/sandstone/.DS_Store b/node_modules/@enact/sandstone/.DS_Store
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..cf71ea4
|
||||||
|
Binary files /dev/null and b/node_modules/@enact/sandstone/.DS_Store differ
|
||||||
diff --git a/node_modules/@enact/sandstone/Dropdown/Dropdown.js b/node_modules/@enact/sandstone/Dropdown/Dropdown.js
|
diff --git a/node_modules/@enact/sandstone/Dropdown/Dropdown.js b/node_modules/@enact/sandstone/Dropdown/Dropdown.js
|
||||||
index 3697a8b..e54caa9 100644
|
index 3697a8b..a8f8c18 100644
|
||||||
--- a/node_modules/@enact/sandstone/Dropdown/Dropdown.js
|
--- a/node_modules/@enact/sandstone/Dropdown/Dropdown.js
|
||||||
+++ b/node_modules/@enact/sandstone/Dropdown/Dropdown.js
|
+++ b/node_modules/@enact/sandstone/Dropdown/Dropdown.js
|
||||||
@@ -111,7 +111,13 @@ var DropdownBase = (0, _kind["default"])({
|
@@ -111,7 +111,13 @@ var DropdownBase = (0, _kind["default"])({
|
||||||
@@ -13,7 +17,7 @@ index 3697a8b..e54caa9 100644
|
|||||||
+ * @type {Boolean}
|
+ * @type {Boolean}
|
||||||
+ * @public
|
+ * @public
|
||||||
+ */
|
+ */
|
||||||
+ 'aria-hidden': _propTypes2["default"].bool,
|
+ 'aria-hidden': _propTypes2["default"].bool,//수정한부분
|
||||||
/**
|
/**
|
||||||
* Items to be displayed in the `Dropdown` when `open`.
|
* Items to be displayed in the `Dropdown` when `open`.
|
||||||
*
|
*
|
||||||
@@ -23,14 +27,15 @@ index 3697a8b..e54caa9 100644
|
|||||||
var _children = _ref3.children,
|
var _children = _ref3.children,
|
||||||
- selected = _ref3.selected;
|
- selected = _ref3.selected;
|
||||||
+ selected = _ref3.selected,
|
+ selected = _ref3.selected,
|
||||||
+ ariaHidden = _ref3['aria-hidden'];
|
+ ariaHidden = _ref3['aria-hidden'];//수정한부분
|
||||||
if (!Array.isArray(_children)) return [];
|
if (!Array.isArray(_children)) return [];
|
||||||
return _children.map(function (child, i) {
|
return _children.map(function (child, i) {
|
||||||
var aria = {
|
var aria = {
|
||||||
role: 'checkbox',
|
- role: 'checkbox',
|
||||||
- 'aria-checked': selected === i
|
- 'aria-checked': selected === i
|
||||||
|
+ role: ariaHidden === true ? 'none' : 'checkbox',
|
||||||
+ 'aria-checked': selected === i,
|
+ 'aria-checked': selected === i,
|
||||||
+ 'aria-hidden' : ariaHidden
|
+ 'aria-hidden' : ariaHidden //수정한부분
|
||||||
};
|
};
|
||||||
process.env.NODE_ENV !== "production" ? (0, _warning["default"])(child != null, "Unsupported null or undefined child provided at index ".concat(i, " which will not be visible when rendered.")) : void 0;
|
process.env.NODE_ENV !== "production" ? (0, _warning["default"])(child != null, "Unsupported null or undefined child provided at index ".concat(i, " which will not be visible when rendered.")) : void 0;
|
||||||
|
|
||||||
@@ -38,24 +43,30 @@ index 3697a8b..e54caa9 100644
|
|||||||
},
|
},
|
||||||
render: function render(_ref8) {
|
render: function render(_ref8) {
|
||||||
var ariaLabel = _ref8['aria-label'],
|
var ariaLabel = _ref8['aria-label'],
|
||||||
+ ariaHidden = _ref8['aria-hidden'],
|
+ ariaHidden = _ref8['aria-hidden'],//수정한부분
|
||||||
ariaLabelledBy = _ref8.ariaLabelledBy,
|
ariaLabelledBy = _ref8.ariaLabelledBy,
|
||||||
children = _ref8.children,
|
children = _ref8.children,
|
||||||
direction = _ref8.direction,
|
direction = _ref8.direction,
|
||||||
@@ -337,7 +346,7 @@ var DropdownBase = (0, _kind["default"])({
|
@@ -337,8 +346,8 @@ var DropdownBase = (0, _kind["default"])({
|
||||||
size = _ref8.size,
|
size = _ref8.size,
|
||||||
title = _ref8.title,
|
title = _ref8.title,
|
||||||
width = _ref8.width,
|
width = _ref8.width,
|
||||||
- rest = _objectWithoutProperties(_ref8, ["aria-label", "ariaLabelledBy", "children", "direction", "disabled", "onClose", "onOpen", "onSelect", "open", "placeholder", "selected", "size", "title", "width"]);
|
- rest = _objectWithoutProperties(_ref8, ["aria-label", "ariaLabelledBy", "children", "direction", "disabled", "onClose", "onOpen", "onSelect", "open", "placeholder", "selected", "size", "title", "width"]);
|
||||||
|
-
|
||||||
+ rest = _objectWithoutProperties(_ref8, ["aria-label", "aria-hidden", "ariaLabelledBy", "children", "direction", "disabled", "onClose", "onOpen", "onSelect", "open", "placeholder", "selected", "size", "title", "width"]);
|
+ rest = _objectWithoutProperties(_ref8, ["aria-label", "aria-hidden", "ariaLabelledBy", "children", "direction", "disabled", "onClose", "onOpen", "onSelect", "open", "placeholder", "selected", "size", "title", "width"]);
|
||||||
|
+ //수정한부분 rest 에 "aria-hidden"추가
|
||||||
delete rest.rtl;
|
delete rest.rtl;
|
||||||
var ariaProps = (0, _util.extractAriaProps)(rest);
|
var ariaProps = (0, _util.extractAriaProps)(rest);
|
||||||
|
var calcAriaProps = ariaLabel != null ? null : {
|
||||||
@@ -360,6 +369,7 @@ var DropdownBase = (0, _kind["default"])({
|
@@ -360,6 +369,7 @@ var DropdownBase = (0, _kind["default"])({
|
||||||
var openDropdown = hasChildren && !disabled && open;
|
var openDropdown = hasChildren && !disabled && open;
|
||||||
return /*#__PURE__*/_react["default"].createElement("div", Object.assign({}, calcAriaProps, rest), title, /*#__PURE__*/_react["default"].createElement(DropdownButton, Object.assign({
|
return /*#__PURE__*/_react["default"].createElement("div", Object.assign({}, calcAriaProps, rest), title, /*#__PURE__*/_react["default"].createElement(DropdownButton, Object.assign({
|
||||||
"aria-label": ariaLabel,
|
"aria-label": ariaLabel,
|
||||||
+ "aria-hidden": ariaHidden,
|
+ "aria-hidden": ariaHidden,//수정한부분
|
||||||
direction: direction,
|
direction: direction,
|
||||||
disabled: hasChildren ? disabled : true,
|
disabled: hasChildren ? disabled : true,
|
||||||
focusEffect: "static",
|
focusEffect: "static",
|
||||||
|
diff --git a/node_modules/@enact/sandstone/Dropdown/Dropdown.js.zip b/node_modules/@enact/sandstone/Dropdown/Dropdown.js.zip
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..e5afa8c
|
||||||
|
Binary files /dev/null and b/node_modules/@enact/sandstone/Dropdown/Dropdown.js.zip differ
|
||||||
|
|||||||
Reference in New Issue
Block a user