@ionic/core 9.0.2 → 9.0.3-dev.11788456135.1ab1d6cd

package/dist/collection/components/col/col.js

@@ -2,11 +2,15 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { Host, forceUpdate, h } from "@stencil/core";
+import { printIonWarning } from "../../utils/logging/index";
 import { matchBreakpoint } from "../../utils/media";
-import { getIonMode } from "../../global/ionic-global";
-const win = typeof window !== 'undefined' ? window : undefined;
-const SUPPORTS_VARS = win && !!(win.CSS && win.CSS.supports && win.CSS.supports('--a: 0'));
+import { getIonTheme } from "../../global/ionic-global";
+// TODO(FW-7285): Replace with global breakpoints
 const BREAKPOINTS = ['', 'xs', 'sm', 'md', 'lg', 'xl'];
+/**
+ * @virtualProp {"ios" | "md"} mode - The mode determines the platform behaviors of the component.
+ * @virtualProp {"ios" | "md" | "ionic"} theme - The theme determines the visual appearance of the component.
+ */
 export class Col {
     onResize() {
         forceUpdate(this);
@@ -28,70 +32,60 @@ export class Col {
         // increase in size and we want to return the largest match
         return matched;
     }
-    calculateSize() {
-        const columns = this.getColumns('size');
+    getStyleClass(property, className, acceptsAuto = false) {
+        const colPropertyValue = this.getColumns(property);
         // If size wasn't set for any breakpoint
         // or if the user set the size without a value
         // it means we need to stick with the default and return
         // e.g. <ion-col size-md>
-        if (!columns || columns === '') {
+        if (!colPropertyValue || colPropertyValue === '') {
             return;
         }
-        // If the size is set to auto then don't calculate a size
-        const colSize = columns === 'auto'
-            ? 'auto'
-            : // If CSS supports variables we should use the grid columns var
-                SUPPORTS_VARS
-                    ? `calc(calc(${columns} / var(--ion-grid-columns, 12)) * 100%)`
-                    : // Convert the columns to a percentage by dividing by the total number
-                        // of columns (12) and then multiplying by 100
-                        (columns / 12) * 100 + '%';
-        return {
-            flex: `0 0 ${colSize}`,
-            width: `${colSize}`,
-            'max-width': `${colSize}`,
-        };
-    }
-    // Called by push, pull, and offset since they use the same calculations
-    calculatePosition(property, modifier) {
-        const columns = this.getColumns(property);
-        if (!columns) {
+        if (acceptsAuto && colPropertyValue === 'auto') {
+            return 'ion-grid-col-auto';
+        }
+        const valueNumber = parseInt(colPropertyValue);
+        if (isNaN(valueNumber)) {
             return;
         }
-        // If the number of columns passed are greater than 0 and less than
-        // 12 we can position the column, else default to auto
-        const amount = SUPPORTS_VARS
-            ? // If CSS supports variables we should use the grid columns var
-                `calc(calc(${columns} / var(--ion-grid-columns, 12)) * 100%)`
-            : // Convert the columns to a percentage by dividing by the total number
-                // of columns (12) and then multiplying by 100
-                columns > 0 && columns < 12
-                    ? (columns / 12) * 100 + '%'
-                    : 'auto';
-        return {
-            [modifier]: amount,
-        };
+        return `${className}-col--${valueNumber}`;
     }
-    calculateOffset(isRTL) {
-        return this.calculatePosition('offset', isRTL ? 'margin-right' : 'margin-left');
+    getSizeClass() {
+        return this.getStyleClass('size', 'ion-grid', true);
     }
-    calculatePull(isRTL) {
-        return this.calculatePosition('pull', isRTL ? 'left' : 'right');
+    getOrderClass() {
+        return this.getStyleClass('order', 'ion-grid-order');
     }
-    calculatePush(isRTL) {
-        return this.calculatePosition('push', isRTL ? 'right' : 'left');
+    getOffsetClass() {
+        return this.getStyleClass('offset', 'ion-grid-offset');
+    }
+    componentDidLoad() {
+        if (this.pull ||
+            this.pullLg ||
+            this.pullMd ||
+            this.pullSm ||
+            this.pullXl ||
+            this.pullXs ||
+            this.push ||
+            this.pushLg ||
+            this.pushMd ||
+            this.pushSm ||
+            this.pushXl ||
+            this.pushXs) {
+            printIonWarning('[ion-col] - The pull and push properties are deprecated and no longer work, in favor of the order and size properties.', this.el);
+        }
     }
     render() {
-        const isRTL = document.dir === 'rtl';
-        const mode = getIonMode(this);
-        return (h(Host, { key: 'e12293a4315cb474bbde73421dd0b4129f1df1cc', class: {
-                [mode]: true,
-            }, style: {
-                ...this.calculateOffset(isRTL),
-                ...this.calculatePull(isRTL),
-                ...this.calculatePush(isRTL),
-                ...this.calculateSize(),
-            } }, h("slot", { key: '869317ea6574111a57a7a9d096c53d264c335d28' })));
+        const theme = getIonTheme(this);
+        const colSize = this.getSizeClass();
+        const colOrder = this.getOrderClass();
+        const colOffset = this.getOffsetClass();
+        return (h(Host, { key: 'a7f3c75c02d39def487697bab9315bda53d15248', class: {
+                [theme]: true,
+                [`${colSize}`]: colSize !== undefined,
+                [`${colOrder}`]: colOrder !== undefined,
+                [`${colOffset}`]: colOffset !== undefined,
+            } }, h("slot", { key: '37f494a03257dbf2e4fa89641c346178963725ae' })));
     }
     static get is() { return "ion-col"; }
     static get encapsulation() { return "shadow"; }
@@ -221,7 +215,26 @@ export class Col {
                 "reflect": false,
                 "attribute": "offset-xl"
             },
-            "pull": {
+            "order": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": "The order of the column, in terms of where the column should position itself in the columns renderer.\nIf no value is passed, the column order implicit value will be the order in the html structure."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "order"
+            },
+            "orderXs": {
                 "type": "string",
                 "mutable": false,
                 "complexType": {
@@ -233,6 +246,104 @@ export class Col {
                 "optional": true,
                 "docs": {
                     "tags": [],
+                    "text": "The order of the column for xs screens, in terms of where the column should position itself in the columns renderer.\nIf no value is passed, the column order implicit value will be the order in the html structure."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "order-xs"
+            },
+            "orderSm": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": "The order of the column for sm screens, in terms of where the column should position itself in the columns renderer.\nIf no value is passed, the column order implicit value will be the order in the html structure."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "order-sm"
+            },
+            "orderMd": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": "The order of the column for md screens, in terms of where the column should position itself in the columns renderer.\nIf no value is passed, the column order implicit value will be the order in the html structure."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "order-md"
+            },
+            "orderLg": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": "The order of the column for lg screens, in terms of where the column should position itself in the columns renderer.\nIf no value is passed, the column order implicit value will be the order in the html structure."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "order-lg"
+            },
+            "orderXl": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": "The order of the column for xl screens, in terms of where the column should position itself in the columns renderer.\nIf no value is passed, the column order implicit value will be the order in the html structure."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "order-xl"
+            },
+            "pull": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to pull the column, in terms of how many columns it should shift to the start of\nthe total available."
                 },
                 "getter": false,
@@ -251,7 +362,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to pull the column for xs screens, in terms of how many columns it should shift\nto the start of the total available."
                 },
                 "getter": false,
@@ -270,7 +384,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to pull the column for sm screens, in terms of how many columns it should shift\nto the start of the total available."
                 },
                 "getter": false,
@@ -289,7 +406,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to pull the column for md screens, in terms of how many columns it should shift\nto the start of the total available."
                 },
                 "getter": false,
@@ -308,7 +428,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to pull the column for lg screens, in terms of how many columns it should shift\nto the start of the total available."
                 },
                 "getter": false,
@@ -327,7 +450,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to pull the column for xl screens, in terms of how many columns it should shift\nto the start of the total available."
                 },
                 "getter": false,
@@ -346,7 +472,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to push the column, in terms of how many columns it should shift to the end\nof the total available."
                 },
                 "getter": false,
@@ -365,7 +494,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to push the column for xs screens, in terms of how many columns it should shift\nto the end of the total available."
                 },
                 "getter": false,
@@ -384,7 +516,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to push the column for sm screens, in terms of how many columns it should shift\nto the end of the total available."
                 },
                 "getter": false,
@@ -403,7 +538,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to push the column for md screens, in terms of how many columns it should shift\nto the end of the total available."
                 },
                 "getter": false,
@@ -422,7 +560,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to push the column for lg screens, in terms of how many columns it should shift\nto the end of the total available."
                 },
                 "getter": false,
@@ -441,7 +582,10 @@ export class Col {
                 "required": false,
                 "optional": true,
                 "docs": {
-                    "tags": [],
+                    "tags": [{
+                            "name": "deprecated",
+                            "text": "Use the combination of `size` and `order` properties to achieve the same effect."
+                        }],
                     "text": "The amount to push the column for xl screens, in terms of how many columns it should shift\nto the end of the total available."
                 },
                 "getter": false,
@@ -565,6 +709,7 @@ export class Col {
             }
         };
     }
+    static get elementRef() { return "el"; }
     static get listeners() {
         return [{
                 "name": "resize",

package/dist/collection/components/content/content.css

@@ -1,3 +1,9 @@
+/**
+ * Convert a pixels given value into rem
+ * 
+ * @param pixels - Value in pixels to be converted (i.e. px)
+ * @param context (optional) - Baseline value
+ */
 /**
  * Convert a font size to a dynamic font size.
  * Fonts that participate in Dynamic Type should use
@@ -98,8 +104,8 @@
 }
 
 #background-content {
-  left: 0px;
   right: 0px;
+  left: 0px;
   top: calc(var(--offset-top) * -1);
   bottom: calc(var(--offset-bottom) * -1);
   position: absolute;
@@ -107,8 +113,8 @@
 }
 
 .inner-scroll {
-  left: 0px;
   right: 0px;
+  left: 0px;
   top: calc(var(--offset-top) * -1);
   bottom: calc(var(--offset-bottom) * -1);
   -webkit-padding-start: var(--padding-start);
@@ -275,4 +281,43 @@
    * still allow the fixed content to appear under the scroll content if specified.
    */
   transform: translateZ(0);
+}
+
+:host(.content-header-hide-scroll-partner:not(.content-fullscreen)) .inner-scroll {
+  transition: transform 300ms cubic-bezier(0, 0, 0.2, 1), height 300ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+:host(.content-header-hide-scroll-partner:not(.content-fullscreen).content-header-hide-scroll-hidden) .inner-scroll {
+  height: calc(100% + var(--internal-header-hide-height, 0px));
+  transform: translateY(calc(-1 * var(--internal-header-hide-height, 0px)));
+  transition: transform 200ms cubic-bezier(0.4, 0, 1, 1), height 200ms cubic-bezier(0.4, 0, 1, 1);
+}
+
+:host(.content-footer-hide-scroll-partner:not(.content-fullscreen)) .inner-scroll {
+  transition: height 200ms cubic-bezier(0.16, 1, 0.3, 1);
+}
+
+:host(.content-footer-hide-scroll-partner:not(.content-fullscreen).content-footer-hide-scroll-hidden) .inner-scroll {
+  height: calc(100% + var(--internal-footer-hide-height, 0px));
+  transition: height 350ms cubic-bezier(0.4, 0, 1, 1);
+}
+
+:host(.content-tab-bar-hide-scroll-partner:not(.content-fullscreen)) .inner-scroll {
+  transition: height 200ms cubic-bezier(0.16, 1, 0.3, 1);
+}
+
+:host(.content-tab-bar-hide-scroll-partner:not(.content-fullscreen).content-tab-bar-hide-scroll-hidden) .inner-scroll {
+  height: calc(100% + var(--internal-tab-bar-hide-height, 0px));
+  transition: height 350ms cubic-bezier(0.4, 0, 1, 1);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  :host(.content-header-hide-scroll-partner:not(.content-fullscreen)) .inner-scroll,
+  :host(.content-header-hide-scroll-partner:not(.content-fullscreen).content-header-hide-scroll-hidden) .inner-scroll,
+  :host(.content-footer-hide-scroll-partner:not(.content-fullscreen)) .inner-scroll,
+  :host(.content-footer-hide-scroll-partner:not(.content-fullscreen).content-footer-hide-scroll-hidden) .inner-scroll,
+  :host(.content-tab-bar-hide-scroll-partner:not(.content-fullscreen)) .inner-scroll,
+  :host(.content-tab-bar-hide-scroll-partner:not(.content-fullscreen).content-tab-bar-hide-scroll-hidden) .inner-scroll {
+    transition: none;
+  }
 }

package/dist/collection/components/content/content.js

@@ -6,8 +6,12 @@ import { componentOnReady, hasLazyBuild, inheritAriaAttributes } from "../../uti
 import { isPlatform } from "../../utils/platform";
 import { isRTL } from "../../utils/rtl/index";
 import { createColorClasses, hostContext } from "../../utils/theme";
-import { getIonMode } from "../../global/ionic-global";
+import { config } from "../../global/config";
+import { getIonMode, getIonTheme } from "../../global/ionic-global";
 /**
+ * @virtualProp {"ios" | "md"} mode - The mode determines the platform behaviors of the component.
+ * @virtualProp {"ios" | "md" | "ionic"} theme - The theme determines the visual appearance of the component.
+ *
  * @slot - Content is placed in the scrollable area if provided without a slot.
  * @slot fixed - Should be used for fixed content that should not scroll.
  *
@@ -216,9 +220,8 @@ export class Content {
             this.resize();
         }, 100);
     }
-    shouldForceOverscroll() {
+    shouldForceOverscroll(mode) {
         const { forceOverscroll } = this;
-        const mode = getIonMode(this);
         return forceOverscroll === undefined ? mode === 'ios' && isPlatform('ios') : forceOverscroll;
     }
     resize() {
@@ -414,12 +417,13 @@ export class Content {
     render() {
         const { fixedSlotPlacement, inheritedAttributes, isMainContent, scrollX, scrollY, el } = this;
         const rtl = isRTL(el) ? 'rtl' : 'ltr';
-        const mode = getIonMode(this);
-        const forceOverscroll = this.shouldForceOverscroll();
-        const transitionShadow = mode === 'ios';
+        const theme = getIonTheme(this);
+        const mode = getIonMode(this, theme);
+        const forceOverscroll = this.shouldForceOverscroll(mode);
+        const transitionShadow = theme === 'ios';
         this.resize();
-        return (h(Host, { key: '9551c759df407b10d809171641fc6e8f14d92219', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
-                [mode]: true,
+        return (h(Host, { key: '8c7f646f58e7c38fb6d8661b1629b847a16753fb', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
+                [theme]: true,
                 'content-fullscreen': this.fullscreen,
                 'content-sizing': hostContext('ion-popover', this.el),
                 overscroll: forceOverscroll,
@@ -427,12 +431,12 @@ export class Content {
             }), style: {
                 '--offset-top': `${this.cTop}px`,
                 '--offset-bottom': `${this.cBottom}px`,
-            }, ...inheritedAttributes }, h("div", { key: 'c6de8fd226f0d10a534eb107fe032ac155fbe68e', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: '082fc2936061360060b48221ecb1c864a3711fa0', class: {
+            }, ...inheritedAttributes }, h("div", { key: '2b0505c3fdf5c92938b8419c0f57f8d999aec6b3', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: '6b769596e491dea1d3618551497fde9364afdeda', class: {
                 'inner-scroll': true,
                 'scroll-x': scrollX,
                 'scroll-y': scrollY,
                 overscroll: (scrollX || scrollY) && forceOverscroll,
-            }, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, h("slot", { key: '0d2286206facb22696a9ca7e74a3f6b7d2397aab' })), transitionShadow ? (h("div", { class: "transition-effect" }, h("div", { class: "transition-cover" }), h("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? h("slot", { name: "fixed" }) : null));
+            }, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, h("slot", { key: 'ba36c8468681d028352415039d2cb2a750f2638f' })), transitionShadow ? (h("div", { class: "transition-effect" }, h("div", { class: "transition-cover" }), h("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? h("slot", { name: "fixed" }) : null));
     }
     static get is() { return "ion-content"; }
     static get encapsulation() { return "shadow"; }
@@ -895,7 +899,8 @@ const getPageElement = (el) => {
      * between the popover and the edges of the screen. But if the popover contains
      * its own page element, we should use that instead.
      */
-    const page = el.closest('ion-app, ion-page, .ion-page, page-inner, .popover-content');
+    const appRootSelector = config.get('appRootSelector', 'ion-app');
+    const page = el.closest(`${appRootSelector}, ion-page, .ion-page, page-inner, .popover-content`);
     if (page) {
         return page;
     }