A11y: Explicit <form> element around compose area (mastodon#19742)

mfenniak · Nov 4, 2022 · 0165449 · 0165449
1 parent c217099
commit 0165449
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/javascript/mastodon/components/button.js b/app/javascript/mastodon/components/button.js
@@ -6,6 +6,7 @@ export default class Button extends React.PureComponent {
 
  static propTypes = {
  text: PropTypes.node,
+ type: PropTypes.string,
  onClick: PropTypes.func,
  disabled: PropTypes.bool,
  block: PropTypes.bool,
@@ -42,6 +43,7 @@ export default class Button extends React.PureComponent {
  onClick={this.handleClick}
  ref={this.setRef}
  title={this.props.title}
+ type={this.props.type}
  >
  {this.props.text || this.props.children}
  </button>

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -217,7 +217,7 @@ class ComposeForm extends ImmutablePureComponent {
  }
 
  return (
- <div className='compose-form'>
+ <form className='compose-form'>
  <WarningContainer />
 
  <ReplyIndicatorContainer />
@@ -279,10 +279,16 @@ class ComposeForm extends ImmutablePureComponent {
 
  <div className='compose-form__publish'>
  <div className='compose-form__publish-button-wrapper'>
- <Button text={publishText} onClick={this.handleSubmit} disabled={!this.canSubmit()} block />
+ <Button
+ type="submit"
+ text={publishText}
+ onClick={this.handleSubmit}
+ disabled={!this.canSubmit()}
+ block
+ />
  </div>
  </div>
- </div>
+ </form>
  );
  }