Compare commits

..

No commits in common. "2bd8afd48620ab4b4cae3ceae8c88968ee2f1458" and "e4a640cceed4c1a33ed554f3faa10afcb6c96ef2" have entirely different histories.

2 changed files with 9 additions and 22 deletions

View file

@ -81,35 +81,23 @@ class SpeciesFacePickerOptions extends HTMLElement {
} }
} }
// TODO: If it ever gets wide support, remove this in favor of the CSS rule class MeasuredContent extends HTMLElement {
// `interpolate-size: allow-keywords`, to animate directly from `auto`.
// https://drafts.csswg.org/css-values-5/#valdef-interpolate-size-allow-keywords
class MeasuredContainer extends HTMLElement {
static observedAttributes = ["style"];
connectedCallback() { connectedCallback() {
setTimeout(() => this.#measure(), 0); setTimeout(() => this.#measure(), 0);
} }
attributeChangedCallback() {
// When `--natural-width` gets morphed away by Turbo, measure it again!
if (this.style.getPropertyValue("--natural-width") === "") {
this.#measure();
}
}
#measure() { #measure() {
// Find our `<measured-content>` child, and set our natural width as // Find our `<measured-container>` parent, and set our natural width
// `var(--natural-width)` in the context of our CSS styles. // as `var(--natural-width)` in the context of its CSS styles.
const content = this.querySelector("measured-content"); const container = this.closest("measured-container");
if (content == null) { if (container == null) {
throw new Error(`<measured-container> must contain a <measured-content>`); throw new Error(`<measured-content> must be in a <measured-container>`);
} }
this.style.setProperty("--natural-width", content.offsetWidth + "px"); container.style.setProperty("--natural-width", this.offsetWidth + "px");
} }
} }
customElements.define("species-color-picker", SpeciesColorPicker); customElements.define("species-color-picker", SpeciesColorPicker);
customElements.define("species-face-picker", SpeciesFacePicker); customElements.define("species-face-picker", SpeciesFacePicker);
customElements.define("species-face-picker-options", SpeciesFacePickerOptions); customElements.define("species-face-picker-options", SpeciesFacePickerOptions);
customElements.define("measured-container", MeasuredContainer); customElements.define("measured-content", MeasuredContent);

View file

@ -70,10 +70,9 @@
%li< %li<
= zone.label = zone.label
- if item_zone_partial_fit? appearances_in_zone, @all_appearances - if item_zone_partial_fit? appearances_in_zone, @all_appearances
= " "
%span.zone-species-info{ %span.zone-species-info{
title: item_zone_species_list(appearances_in_zone) title: item_zone_species_list(appearances_in_zone)
}< }
(#{appearances_in_zone.size} species) (#{appearances_in_zone.size} species)
- else - else
%span.no-zones (None) %span.no-zones (None)