Skip to content

A platform for community discussion. Free, open, simple.

DEV: Simpler fk-textarea sizing (#38500)

Jarek Radosz75273a687d16
diff --git a/app/assets/stylesheets/common/form-kit/_control-textarea.scss b/app/assets/stylesheets/common/form-kit/_control-textarea.scss
index 0432df5a36e..0ac9ab7f6c1 100644
--- a/app/assets/stylesheets/common/form-kit/_control-textarea.scss
+++ b/app/assets/stylesheets/common/form-kit/_control-textarea.scss
@@ -1,11 +1,12 @@
.form-kit__control-textarea {
// prevents firefox/chrome to add spacing under textarea
display: block;
+ min-height: 150px;
+ min-width: var(--form-kit-large-input);
@include default-input {
// reset textarea styles
height: 150px;
- min-width: auto !important;
padding: 0.5em !important;
}
}
diff --git a/app/assets/stylesheets/common/form-kit/_field.scss b/app/assets/stylesheets/common/form-kit/_field.scss
index c8119bb5dff..458a8167099 100644
--- a/app/assets/stylesheets/common/form-kit/_field.scss
+++ b/app/assets/stylesheets/common/form-kit/_field.scss
@@ -9,7 +9,6 @@
width: 100%;
}
- &-textarea,
&-composer,
&-code,
&-image {
@@ -18,6 +17,13 @@
}
}
+ &-textarea {
+ .form-kit__container-content {
+ min-width: var(--form-kit-large-input);
+ width: fit-content !important;
+ }
+ }
+
&-toggle {
flex-direction: row;
align-items: center;
diff --git a/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs b/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs
index 880e1f416c3..a0727624dcb 100644
--- a/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs
@@ -1,25 +1,12 @@
import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { htmlSafe } from "@ember/template";
-import { modifier as modifierFn } from "ember-modifier";
import FKBaseControl from "discourse/form-kit/components/fk/control/base";
import { escapeExpression } from "discourse/lib/utilities";
export default class FKControlTextarea extends FKBaseControl {
static controlType = "textarea";
- resizeObserver = modifierFn((element) => {
- const observer = new ResizeObserver(() => {
- this.args.field.controlWidth = element.offsetWidth;
- });
-
- observer.observe(element);
-
- return () => {
- observer.disconnect();
- };
- });
-
@action
handleInput(event) {
this.args.field.set(event.target.value);
@@ -64,7 +51,6 @@ export default class FKControlTextarea extends FKBaseControl {
aria-invalid={{if @field.error "true"}}
aria-describedby={{if @field.error @field.errorId}}
...attributes
- {{this.resizeObserver}}
{{on "input" this.handleInput}}
{{on "keydown" this.onKeyDown}}
/>
diff --git a/frontend/discourse/app/form-kit/components/fk/field-data.gjs b/frontend/discourse/app/form-kit/components/fk/field-data.gjs
index 7a56c4d9ffc..288c8d1fe0e 100644
--- a/frontend/discourse/app/form-kit/components/fk/field-data.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/field-data.gjs
@@ -10,7 +10,6 @@ import uniqueId from "discourse/helpers/unique-id";
*/
export default class FKFieldData extends Component {
@tracked type;
- @tracked controlWidth = "auto";
/**
* Unique identifier for the field.
diff --git a/frontend/discourse/app/form-kit/components/fk/field.gjs b/frontend/discourse/app/form-kit/components/fk/field.gjs
index 5264928566a..9f7c45319e8 100644
--- a/frontend/discourse/app/form-kit/components/fk/field.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/field.gjs
@@ -163,11 +163,7 @@ export default class FKField extends Component {
>{{field.helpText}}</FKText>
{{/if}}
- <FKMeta
- @field={{field}}
- @error={{field.error}}
- @controlWidth={{field.controlWidth}}
- />
+ <FKMeta @field={{field}} @error={{field.error}} />
</div>
</div>
{{else}}
diff --git a/frontend/discourse/app/form-kit/components/fk/meta.gjs b/frontend/discourse/app/form-kit/components/fk/meta.gjs
index effc32e614d..feb39f0450e 100644
--- a/frontend/discourse/app/form-kit/components/fk/meta.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/meta.gjs
@@ -1,6 +1,4 @@
import Component from "@glimmer/component";
-import { concat } from "@ember/helper";
-import { htmlSafe } from "@ember/template";
import FKCharCounter from "discourse/form-kit/components/fk/char-counter";
import FKErrors from "discourse/form-kit/components/fk/errors";
@@ -17,16 +15,9 @@ export default class FKMeta extends Component {
return this.args.showMeta ?? true;
}
- get width() {
- return this.args.controlWidth ? `${this.args.controlWidth}px` : "auto";
- }
-
<template>
{{#if this.shouldRenderMeta}}
- <div
- class="form-kit__meta"
- style={{htmlSafe (concat "width: " this.width)}}
- >
+ <div class="form-kit__meta">
{{#if @error}}
<FKErrors @id={{@field.errorId}} @error={{@error}} />
{{/if}}