@lumx/core 2.1.8 → 2.1.9-alpha-thumbnail

package/package.json

@@ -42,7 +42,7 @@
         "version": "yarn version-changelog ../../CHANGELOG.md && yarn changelog-verify ../../CHANGELOG.md && git add ../../CHANGELOG.md"
     },
     "sideEffects": false,
-    "version": "2.1.8",
+    "version": "2.1.9-alpha-thumbnail",
     "devDependencies": {
         "@babel/core": "^7.8.3",
         "@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -82,5 +82,5 @@
         "moment": "^2.24.0",
         "moment-range": "^4.0.2"
     },
-    "gitHead": "e4e589f8924784b34e3a0dcdbbb71f0ed0ae82b8"
+    "gitHead": "e89e3ca2d44ff4b4aeb73af5662aea190d93f8a3"
 }

package/scss/_components.scss

@@ -23,6 +23,7 @@
 @import './components/radio-button/mixins';
 @import './components/select/mixins';
 @import './components/side-navigation/mixins';
+@import './components/skeleton/mixins';
 @import './components/slideshow/variables';
 @import './components/switch/mixins';
 @import './components/table/mixins';

package/scss/components/skeleton/_index.scss

@@ -18,15 +18,14 @@
    ========================================================================== */
 
 .#{$lumx-base-prefix}-skeleton-circle {
-    animation: skeleton-loading 1s ease-in-out 0s infinite;
     border-radius: 50%;
 
     &--theme-light {
-        background-color: lumx-color-variant('dark', 'L5');
+        @include lumx-skeleton('light');
     }
 
     &--theme-dark {
-        background-color: lumx-color-variant('light', 'L5');
+        @include lumx-skeleton('dark');
     }
 }
 
@@ -47,18 +46,16 @@
    ========================================================================== */
 
 .#{$lumx-base-prefix}-skeleton-rectangle {
-    animation: skeleton-loading 1s ease-in-out 0s infinite;
-
     &--variant-rounded {
         border-radius: var(--lumx-border-radius);
     }
 
     &--theme-light {
-        background-color: lumx-color-variant('dark', 'L5');
+        @include lumx-skeleton('light');
     }
 
     &--theme-dark {
-        background-color: lumx-color-variant('light', 'L5');
+        @include lumx-skeleton('dark');
     }
 }
 

package/scss/components/skeleton/_mixins.scss

@@ -0,0 +1,10 @@
+
+@mixin lumx-skeleton($theme: 'light') {
+    animation: skeleton-loading 1s ease-in-out 0s infinite;
+
+    @if $theme == 'light' {
+        background-color: lumx-color-variant('dark', 'L5');
+    } @else {
+        background-color: lumx-color-variant('light', 'L5');
+    }
+}

package/scss/components/thumbnail/_index.scss

@@ -12,45 +12,19 @@
     background: none;
     outline: none;
 
-    &--fill-height,
-    &--fill-height &__background {
-        display: flex;
-        /* Safari hack to force the image ratio */
-        height: fit-content;
-        min-height: 100%;
-        flex: 1 1 auto;
-        flex-direction: column;
-        justify-content: center;
-    }
-
-    &--variant-rounded {
-        border-radius: var(--lumx-border-radius);
-    }
-
     &__background {
-        position: relative;
-        width: 100%;
+        overflow: hidden;
         background-position: center;
         background-repeat: no-repeat;
         background-size: cover;
-
-        #{$self}--variant-rounded & {
-            border-radius: var(--lumx-border-radius);
-        }
     }
 
-    &__focused-image {
-        max-width: none;
+    &__image {
+        display: block;
     }
 
     &__background,
     &__image {
-        display: block;
-        max-width: 100%;
-        /* IE11 hack related to a bug with IE flexbox implementation (cf. https://stackoverflow.com/a/54054592) */
-        min-height: 1px;
-        max-height: 100%;
-
         #{$self}--align-left & {
             margin-right: auto;
         }
@@ -62,16 +36,6 @@
         #{$self}--align-right & {
             margin-left: auto;
         }
-
-        #{$self}--variant-rounded & {
-            border-radius: var(--lumx-border-radius);
-        }
-    }
-
-    &__fallback {
-        width: fit-content;
-        /* Center fallback icon when using fill-height prop */
-        margin: 0 auto;
     }
 
     &__badge {
@@ -79,24 +43,114 @@
         right: -$lumx-spacing-unit / 2;
         bottom: -$lumx-spacing-unit / 2;
     }
+
+    /* Rounded variant */
+    &--variant-rounded &__background {
+        border-radius: var(--lumx-border-radius);
+    }
+
+    &--fill-height,
+    &--fill-height &__background,
+    &--fill-height &__image {
+        flex: 1 1 auto;
+        height: 100%;
+    }
+
+    /* Thumbnail original ratio */
+    &--aspect-ratio-original {
+        &:not(#{$self}--fill-height) {
+            width: fit-content;
+            height: fit-content;
+
+            #{$self}__image:not(#{$self}__image--is-loading)
+            {
+                width: fit-content;
+                height: fit-content;
+                max-width: 100%;
+                max-height: 100%;
+            }
+        }
+
+        &#{$self}--fill-height {
+            #{$self}__background,
+            #{$self}__image
+            {
+                max-height: unset;
+                max-width: unset;
+            }
+        }
+    }
+
+    /* Thumbnail error fallback */
+    &--has-error {
+        #{$self}__background {
+            display: grid;
+
+            // Stack image and fallback on top of each other
+            & > * {
+                grid-column: 1;
+                grid-row: 1;
+            }
+        }
+
+        #{$self}__fallback {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background-color: lumx-color-variant('dark', 'L6');
+        }
+    }
+
 }
 
 /* Thumbnail sizes
    ========================================================================== */
 
 @each $key, $size in $lumx-sizes {
-    .#{$lumx-base-prefix}-thumbnail--size-#{$key} {
+    .#{$lumx-base-prefix}-thumbnail--size-#{$key}:not(.#{$lumx-base-prefix}-thumbnail--fill-height) {
         width: $size;
+
+        .#{$lumx-base-prefix}-thumbnail__image {
+            width: 100%;
+        }
     }
 }
 
 /* Thumbnail aspect ratio
    ========================================================================== */
 
+.#{$lumx-base-prefix}-thumbnail:not(.#{$lumx-base-prefix}-thumbnail--aspect-ratio-original) {
+    &::before {
+        display: block;
+        content: "";
+        //width: 100%;
+        //float: left;
+    }
+
+    /*&::after {
+        display: block;
+        content: "";
+        clear: both;
+    }*/
+
+    .#{$lumx-base-prefix}-thumbnail__background {
+        position: absolute;
+        inset: 0;
+    }
+
+    .#{$lumx-base-prefix}-thumbnail__image {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        object-position: center;
+    }
+}
+
 @each $key, $aspect-ratio in $lumx-thumbnail-aspect-ratio {
-    .#{$lumx-base-prefix}-thumbnail--aspect-ratio-#{$key}:not(.#{$lumx-base-prefix}-thumbnail--fill-height)
-        .#{$lumx-base-prefix}-thumbnail__background {
-        padding-top: $aspect-ratio;
+    .#{$lumx-base-prefix}-thumbnail--aspect-ratio-#{$key} {
+        &::before {
+            padding-top: $aspect-ratio;
+        }
     }
 }
 
@@ -120,34 +174,49 @@
         pointer-events: none;
     }
 
+    /* Hover */
     &:hover::after,
     &:focus::after {
         @include lumx-state(lumx-base-const('state', 'HOVER'), lumx-base-const('emphasis', 'LOW'), 'dark');
     }
 
+    /* Active */
     &:active::after {
         @include lumx-state(lumx-base-const('state', 'ACTIVE'), lumx-base-const('emphasis', 'LOW'), 'dark');
     }
 }
 
+/* Focused (variant rounded) */
 .#{$lumx-base-prefix}-thumbnail--variant-rounded.#{$lumx-base-prefix}-thumbnail--is-clickable {
     &[data-focus-visible-added]::after {
         border-radius: var(--lumx-border-radius);
     }
 }
 
+/* Focused (light theme) */
 .#{$lumx-base-prefix}-thumbnail--theme-light.#{$lumx-base-prefix}-thumbnail--is-clickable {
     &[data-focus-visible-added]::after {
         @include lumx-state(lumx-base-const('state', 'FOCUS'), lumx-base-const('emphasis', 'LOW'), 'dark');
     }
 }
 
+/* Focused (dark theme) */
 .#{$lumx-base-prefix}-thumbnail--theme-dark.#{$lumx-base-prefix}-thumbnail--is-clickable {
     &[data-focus-visible-added]::after {
         @include lumx-state(lumx-base-const('state', 'FOCUS'), lumx-base-const('emphasis', 'LOW'), 'light');
     }
 }
 
+/* Loading */
+.#{$lumx-base-prefix}-thumbnail--is-loading  {
+    &.#{$lumx-base-prefix}-thumbnail--theme-dark .#{$lumx-base-prefix}-thumbnail__background {
+        @include lumx-skeleton('dark');
+    }
+    &.#{$lumx-base-prefix}-thumbnail--theme-light .#{$lumx-base-prefix}-thumbnail__background {
+        @include lumx-skeleton('light');
+    }
+}
+
 /* Thumbnail badge mask
    ========================================================================== */