Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into benelan/text-area-inva…
Browse files Browse the repository at this point in the history
…lid-border-color

* origin/dev:
  ci(changelog): add deprecation commits to changelog automation (#10346)
  fix: properly set aria attributes on components (#10404)
  feat: add parcel parameter (#10384)
  • Loading branch information
benelan committed Sep 26, 2024
2 parents 6c384ac + 89194b0 commit e8ccf1e
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 21 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ Contributions must adhere to **one** of the following conventions:
- **`refactor`**: A change that neither fixes a bug or adds a feature 🔁
- **`revert`**: Reverts a previous commit ↪️
- **`test`**: Improves test coverage in updating a test or adding a new, or missing test 🧪
- **`deprecate`**: Documentation only changes for a deprecation 👎

### Scope of change

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export class Button
<InteractiveContainer disabled={this.disabled}>
<Tag
aria-busy={toAriaBoolean(this.loading)}
aria-expanded={this.el.ariaExpanded}
aria-expanded={this.el.ariaExpanded ? this.el.ariaExpanded : null}
aria-label={!this.loading ? getLabelText(this) : this.messages.loading}
aria-live="polite"
class={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ import {
Watch,
} from "@stencil/core";
import { FlipContext } from "../interfaces";
import { Direction, getElementDir, slotChangeGetAssignedElements } from "../../utils/dom";
import {
Direction,
getElementDir,
slotChangeGetAssignedElements,
toAriaBoolean,
} from "../../utils/dom";
import {
componentFocusable,
LoadableComponent,
Expand Down Expand Up @@ -470,8 +475,8 @@ export class CalciteMenuItem implements LoadableComponent, T9nComponent, Localiz
<div class={CSS.itemContent}>
<a
aria-current={this.isFocused ? "page" : false}
aria-expanded={this.open}
aria-haspopup={this.hasSubmenu}
aria-expanded={toAriaBoolean(this.open)}
aria-haspopup={toAriaBoolean(this.hasSubmenu)}
aria-label={this.label}
class={{ [CSS.layoutVertical]: this.layout === "vertical", [CSS.content]: true }}
href={this.href}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,7 @@ export class TableCell
tabIndex={staticCell ? -1 : 0}
>
{(this.selectionCell || this.readCellContentsToAT) && (
<span
aria-hidden={true}
aria-live={this.focused ? "polite" : "off"}
class={CSS.assistiveText}
>
<span aria-live={this.focused ? "polite" : "off"} class={CSS.assistiveText}>
{this.selectionCell && this.selectionText}
{this.readCellContentsToAT && !this.selectionCell && this.contentsText}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,7 @@ export class TableHeader implements LocalizedComponent, LoadableComponent, T9nCo
/>
)}
{(this.selectionCell || this.numberCell) && (
<span
aria-hidden={true}
aria-live={this.focused ? "polite" : "off"}
class={CSS.assistiveText}
>
<span aria-live={this.focused ? "polite" : "off"} class={CSS.assistiveText}>
{this.screenReaderText}
</span>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import {
} from "@stencil/core";
import { LocalizedComponent } from "../../utils/locale";
import { Alignment, Scale, SelectionMode } from "../interfaces";
import { focusElementInGroup, FocusElementInGroupDestination } from "../../utils/dom";
import {
focusElementInGroup,
FocusElementInGroupDestination,
toAriaBoolean,
} from "../../utils/dom";
import { RowType, TableInteractionMode, TableRowFocusEvent } from "../table/interfaces";
import { isActivationKey } from "../../utils/key";
import {
Expand Down Expand Up @@ -410,7 +414,7 @@ export class TableRow implements InteractiveComponent, LocalizedComponent {
<InteractiveContainer disabled={this.disabled}>
<tr
aria-rowindex={this.positionAll + 1}
aria-selected={this.selected}
aria-selected={toAriaBoolean(this.selected)}
class={{ [CSS.lastVisibleRow]: this.lastVisibleRow }}
onKeyDown={this.keyDownHandler}
ref={(el) => (this.tableRowEl = el)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export class TextArea
</footer>
<HiddenFormInputSlot component={this} />
{this.isCharacterLimitExceeded() && (
<span aria-hidden={true} aria-live="polite" class={CSS.assistiveText} id={this.guid}>
<span aria-live="polite" class={CSS.assistiveText} id={this.guid}>
{this.replacePlaceHoldersInMessages()}
</span>
)}
Expand Down
8 changes: 4 additions & 4 deletions packages/calcite-components/src/components/tree/tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Prop,
VNode,
} from "@stencil/core";
import { focusElement, nodeListToArray } from "../../utils/dom";
import { focusElement, nodeListToArray, toAriaBoolean } from "../../utils/dom";
import { Scale, SelectionMode } from "../interfaces";
import { TreeItemSelectDetail } from "../tree-item/interfaces";
import { getTraversableItems, isTreeItem } from "./utils";
Expand Down Expand Up @@ -88,9 +88,9 @@ export class Tree {
aria-multiselectable={
this.child
? undefined
: (
this.selectionMode === "multiple" || this.selectionMode === "multichildren"
).toString()
: toAriaBoolean(
this.selectionMode === "multiple" || this.selectionMode === "multichildren",
)
}
onKeyDown={this.keyDownHandler}
role={!this.child ? "tree" : undefined}
Expand Down
5 changes: 5 additions & 0 deletions packages/calcite-ui-icons/docs/keywords.json
Original file line number Diff line number Diff line change
Expand Up @@ -9006,6 +9006,11 @@
"category": "GIS",
"release": "3.32.0"
},
"parcel-parameter": {
"alias": ["3.32.0", "gis", "feature", "data", "points", "lines", "assets"],
"category": "GIS",
"release": "3.32.0"
},
"n-variable": {
"alias": ["3.32.0", "text", "variables", "math", "calculation", "letter"],
"category": "Text",
Expand Down
1 change: 1 addition & 0 deletions packages/calcite-ui-icons/icons/parcel-parameter-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/calcite-ui-icons/icons/parcel-parameter-24.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/calcite-ui-icons/icons/parcel-parameter-32.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@
"tag-separator": "@",
"draft-pull-request": true,
"include-v-in-tag": false,
"changelog-sections": [
{ "type": "feat", "section": "Features" },
{ "type": "fix", "section": "Bug Fixes" },
{ "type": "perf", "section": "Performance Improvements" },
{ "type": "revert", "section": "Reverts", "hidden": true },
{ "type": "deprecate", "section": "Deprecations" },
{ "type": "docs", "section": "Documentation", "hidden": true },
{ "type": "style", "section": "Styles", "hidden": true },
{ "type": "chore", "section": "Miscellaneous Chores", "hidden": true },
{ "type": "refactor", "section": "Code Refactoring", "hidden": true },
{ "type": "test", "section": "Tests", "hidden": true },
{ "type": "build", "section": "Build System", "hidden": true },
{ "type": "ci", "section": "Continuous Integration", "hidden": true }
],
"packages": {
"packages/calcite-components": {
"component": "@esri/calcite-components",
Expand Down

0 comments on commit e8ccf1e

Please sign in to comment.