Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into benelan/add-setfocus
Browse files Browse the repository at this point in the history
* origin/master:
  docs(input-number, input-text): remove unsupported boolean type from type prop doc (#6394)
  ci(release): lint readme and changelog before committing (#6406)
  ci: allow multiple product team labels (#6411)
  • Loading branch information
benelan committed Feb 3, 2023
2 parents 60d39ea + f69995e commit 1d3f53d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 17 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/add-esri-product-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,6 @@ jobs:
});
}
/** remove any existing product label(s) */
const existingProductLabels = currentLabels
.filter((l) => /Issues logged by/.test(l.description) && l.name !== product)
.forEach(
async (l) =>
await github.rest.issues.removeLabel({
issue_number,
owner,
repo,
name: l.name,
})
);
/** add new product label */
await github.rest.issues.addLabels({
issue_number,
Expand Down
2 changes: 1 addition & 1 deletion .versionrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"changelog": true
},
"scripts": {
"precommit": "ts-node --esm ./support/prepReleaseCommit.ts"
"precommit": "ts-node --esm ./support/prepReleaseCommit.ts && npm run lint:md && git add readme.md CHANGELOG.md"
},
"header": "# Changelog\n\nThis document maintains a list of released versions and changes introduced by them.\nThis project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)\n\n"
}
6 changes: 4 additions & 2 deletions src/components/input-number/input-number.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ export class InputNumber
@Prop({ reflect: true }) hidden = false;

/**
* When `true`, shows a default recommended icon. Alternatively, pass a Calcite UI Icon name to display a specific icon.
* Specifies an icon to display.
*
* @futureBreaking Remove boolean type as it is not supported.
*/
@Prop({ reflect: true }) icon: string | boolean;

Expand Down Expand Up @@ -808,7 +810,7 @@ export class InputNumber
};

const sanitizedValue = sanitizeNumberString(
// no need to delocalize a string that ia already in latn numerals
// no need to delocalize a string that ia already in latn numerals
(this.numberingSystem && this.numberingSystem !== "latn") || defaultNumberingSystem !== "latn"
? numberStringFormatter.delocalize(value)
: value
Expand Down
4 changes: 3 additions & 1 deletion src/components/input-text/input-text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ export class InputText
@Prop({ reflect: true }) hidden = false;

/**
* When `true`, shows a default recommended icon. Alternatively, pass a Calcite UI Icon name to display a specific icon.
* Specifies an icon to display.
*
* @futureBreaking Remove boolean type as it is not supported.
*/
@Prop({ reflect: true }) icon: string | boolean;

Expand Down

0 comments on commit 1d3f53d

Please sign in to comment.