mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-24 00:07:02 -04:00
Autosize textboxes w/out highlighting placeholders
Scrolling within textareas on the page is a bit grim. Which is why we don’t do it for the textboxes that people use to edit templates. This commit will allow us to extend the auto-resizing of `<textarea>`s to those which don’t need the highlighting of placeholders. The code is still quite coupled to the placeholder highlighting code, because both work by copying the content of the `<textarea>` into a `<div>` that underlaps the textbox. This `<div>` is used for both rendering the placeholder highlights, and calculating the natural height of the content. So it would be hard/confusing to split the two bits of code into separate modules.
This commit is contained in:
@@ -11,6 +11,13 @@
|
|||||||
|
|
||||||
this.start = function(textarea) {
|
this.start = function(textarea) {
|
||||||
|
|
||||||
|
let visibleTextbox;
|
||||||
|
|
||||||
|
this.highlightPlaceholders = (
|
||||||
|
typeof textarea.data('highlightPlaceholders') === 'undefined' ||
|
||||||
|
!!textarea.data('highlightPlaceholders')
|
||||||
|
);
|
||||||
|
|
||||||
this.$textbox = $(textarea)
|
this.$textbox = $(textarea)
|
||||||
.wrap(`
|
.wrap(`
|
||||||
<div class='textbox-highlight-wrapper' />
|
<div class='textbox-highlight-wrapper' />
|
||||||
@@ -20,13 +27,19 @@
|
|||||||
`))
|
`))
|
||||||
.on("input", this.update);
|
.on("input", this.update);
|
||||||
|
|
||||||
this.initialHeight = this.$textbox.height();
|
visibleTextbox = this.$textbox.clone().appendTo("body").css({
|
||||||
|
position: 'absolute',
|
||||||
|
visibility: 'hidden',
|
||||||
|
display: 'block'
|
||||||
|
});
|
||||||
|
this.initialHeight = visibleTextbox.height();
|
||||||
|
|
||||||
this.$background.css({
|
this.$background.css({
|
||||||
'width': this.$textbox.outerWidth(),
|
|
||||||
'border-width': this.$textbox.css('border-width')
|
'border-width': this.$textbox.css('border-width')
|
||||||
});
|
});
|
||||||
|
|
||||||
|
visibleTextbox.remove();
|
||||||
|
|
||||||
this.$textbox
|
this.$textbox
|
||||||
.trigger("input");
|
.trigger("input");
|
||||||
|
|
||||||
@@ -34,6 +47,8 @@
|
|||||||
|
|
||||||
this.resize = () => {
|
this.resize = () => {
|
||||||
|
|
||||||
|
this.$background.width(this.$textbox.outerWidth());
|
||||||
|
|
||||||
this.$textbox.height(
|
this.$textbox.height(
|
||||||
Math.max(
|
Math.max(
|
||||||
this.initialHeight,
|
this.initialHeight,
|
||||||
@@ -47,17 +62,23 @@
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.escapedMessage = () => $('<div/>').text(this.$textbox.val()).html();
|
this.contentEscaped = () => $('<div/>').text(this.$textbox.val()).html();
|
||||||
|
|
||||||
this.replacePlaceholders = () => this.$background.html(
|
this.contentReplaced = () => this.contentEscaped().replace(
|
||||||
this.escapedMessage().replace(
|
tagPattern, (match, name, separator, value) => value && separator ?
|
||||||
tagPattern, (match, name, separator, value) => value && separator ?
|
`<span class='placeholder-conditional'>((${name}??</span>${value}))` :
|
||||||
`<span class='placeholder-conditional'>((${name}??</span>${value}))` :
|
`<span class='placeholder'>((${name}${value}))</span>`
|
||||||
`<span class='placeholder'>((${name}${value}))</span>`
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
this.update = () => this.replacePlaceholders() && this.resize();
|
this.update = () => {
|
||||||
|
|
||||||
|
this.$background.html(
|
||||||
|
this.highlightPlaceholders ? this.contentReplaced() : this.contentEscaped()
|
||||||
|
);
|
||||||
|
|
||||||
|
this.resize();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
hint=False,
|
hint=False,
|
||||||
highlight_tags=False,
|
highlight_tags=False,
|
||||||
autofocus=False,
|
autofocus=False,
|
||||||
|
autosize=False,
|
||||||
colour_preview=False,
|
colour_preview=False,
|
||||||
help_link=None,
|
help_link=None,
|
||||||
help_link_text=None,
|
help_link_text=None,
|
||||||
@@ -47,7 +48,8 @@
|
|||||||
%}
|
%}
|
||||||
{{ field(
|
{{ field(
|
||||||
class=field_class,
|
class=field_class,
|
||||||
data_module='highlight-tags' if highlight_tags else '',
|
data_module='highlight-tags' if highlight_tags or autosize else '',
|
||||||
|
data_highlight_placeholders='true' if highlight_tags else 'false',
|
||||||
rows=rows|string,
|
rows=rows|string,
|
||||||
**kwargs
|
**kwargs
|
||||||
) }}
|
) }}
|
||||||
|
|||||||
@@ -125,6 +125,34 @@ describe('Highlight tags', () => {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("The element's width should match even when the textbox is initially hidden", () => {
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
|
||||||
|
let setDisplayPropertyOfFormGroups = function(property) {
|
||||||
|
Array.prototype.forEach.call(
|
||||||
|
document.getElementsByClassName('form-group'),
|
||||||
|
element => element.style.display = property
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
setDisplayPropertyOfFormGroups('none');
|
||||||
|
|
||||||
|
window.GOVUK.modules.start();
|
||||||
|
|
||||||
|
setDisplayPropertyOfFormGroups('block');
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
test("If the textbox is an <textarea>", () => {
|
||||||
|
|
||||||
|
backgroundEl = textarea.nextElementSibling;
|
||||||
|
expect(backgroundEl.style.width).toEqual('582px');
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
test("The element should be hidden from assistive technologies", () => {
|
test("The element should be hidden from assistive technologies", () => {
|
||||||
|
|
||||||
expect(backgroundEl.getAttribute('aria-hidden')).toEqual('true');
|
expect(backgroundEl.getAttribute('aria-hidden')).toEqual('true');
|
||||||
@@ -167,6 +195,22 @@ describe('Highlight tags', () => {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("Unless a data attribute is set to turn this feature off", () => {
|
||||||
|
|
||||||
|
textarea.textContent = "Dear ((title)) ((name))";
|
||||||
|
textarea.setAttribute('data-highlight-placeholders', 'false')
|
||||||
|
|
||||||
|
// start module
|
||||||
|
window.GOVUK.modules.start();
|
||||||
|
|
||||||
|
backgroundEl = textarea.nextElementSibling;
|
||||||
|
|
||||||
|
const highlightTags = backgroundEl.querySelectorAll('.placeholder');
|
||||||
|
|
||||||
|
expect(highlightTags.length).toEqual(0);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("If there is optional text in the content, its matching text in the element below should be wrapped in a highlight tag", () => {
|
describe("If there is optional text in the content, its matching text in the element below should be wrapped in a highlight tag", () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user