Skip to content

Commit

Permalink
Merge branch 'develop' into 1042-a11y-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasbouttell-camunda authored Feb 14, 2024
2 parents acd58b7 + 639c918 commit bbf4ff2
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ jobs:
TEST_BROWSERS: ChromeHeadless
run: npm run all
- name: Upload coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: runner.os == 'Linux'
2 changes: 1 addition & 1 deletion .github/workflows/TASKLIST_CARBONISATION.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Run Playwright tests
working-directory: ./tasklist/client
run: yarn playwright form-js-integration
- uses: actions/upload-artifact@3a8048248f2f288c271830f8ecf2a1c5d8eb0e9a
- uses: actions/upload-artifact@4c0ff1c489dca52fedb26375d7d8fe7bd9233f19
if: always()
with:
name: playwright-report
Expand Down
51 changes: 23 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"cross-env": "^7.0.3",
"css-loader": "^6.7.3",
"del-cli": "^5.0.0",
"diagram-js": "^13.4.0",
"diagram-js": "^14.0.0",
"didi": "^10.0.1",
"eslint": "^8.53.0",
"eslint-plugin-bpmn-io": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,12 @@ function Height(props) {
description,
editField,
field,
id,
defaultValue = 60 // default value for spacer
id
} = props;

const debounce = useService('debounce');

const getValue = (e) => get(field, [ 'height' ], defaultValue);
const getValue = (e) => get(field, [ 'height' ], null);

const setValue = (value, error) => {
if (error) {
Expand Down Expand Up @@ -77,7 +76,7 @@ function Height(props) {
*/
const validate = (value) => {
if (typeof value !== 'number') {
return null;
return 'A number is required.';
}

if (!Number.isInteger(value)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function Content(props) {

// helpers //////////

const description = <>Supports HTML, styling, and templating. Styles are automatically scoped to the HTML component. <a href="https://docs.camunda.io/docs/components/modeler/forms/form-element-library/forms-element-library-html/" target="_blank">Learn more</a></>;
const description = <>Supports HTML, styling, and templating. Styles are automatically scoped to the HTML component. <a href="https://docs.camunda.io/docs/next/components/modeler/forms/form-element-library/forms-element-library-html/" target="_blank">Learn more</a></>;

/**
* @param {string|void} value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export function IFrameHeightEntry(props) {
return [
...HeightEntry({
...props,
defaultValue: 300,
description: 'Height of the container in pixels.',
isDefaultVisible: (field) => field.type === 'iframe'
})
Expand Down

0 comments on commit bbf4ff2

Please sign in to comment.