Merge branch 'main' into cb/vue-ot-update

Author: brandyscarney

.github/workflows/actions/test-core-screenshot/action.yml

@@ -49,7 +49,7 @@ runs:
       # which is why we not using the upload-archive
       # composite step here.
       run: |
-        npm run test.e2e.docker.ci ${{ inputs.component }} -- --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots
+        npm run test.e2e.docker.ci ${{ inputs.component }} -- --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots='changed'
         git add src/\*.png --force
         mkdir updated-screenshots
         cd ../ && rsync -R --progress $(git diff --name-only --cached) core/updated-screenshots

core/package.json

@@ -93,13 +93,13 @@
     "test": "npm run test.spec && npm run test.e2e",
     "test.spec": "stencil test --spec --max-workers=2",
     "test.e2e": "npx playwright test",
-    "test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots",
+    "test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots='changed'",
     "test.watch": "jest --watch --no-cache",
     "test.treeshake": "node scripts/treeshaking.js dist/index.js",
     "validate": "npm run lint && npm run test && npm run build && npm run test.treeshake",
     "docker.build": "docker build -t ionic-playwright .",
     "test.e2e.docker": "npm run docker.build && node ./scripts/docker.mjs",
-    "test.e2e.docker.update-snapshots": "npm run test.e2e.docker -- --update-snapshots",
+    "test.e2e.docker.update-snapshots": "npm run test.e2e.docker -- --update-snapshots='changed'",
     "test.e2e.docker.ci": "npm run docker.build && CI=true node ./scripts/docker.mjs",
     "test.e2e.script": "node scripts/testing/e2e-script.mjs"
   },

core/src/components/infinite-scroll/test/top/infinite-scroll.e2e.ts

@@ -3,7 +3,10 @@ import { configs, test } from '@utils/test/playwright';
 
 configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
   test.describe(title('infinite-scroll: top'), () => {
-    test('should load more items when scrolled to the top', async ({ page }) => {
+    test('should load more items when scrolled to the top', async ({ page, skip }) => {
+      // TODO(FW-6394): remove once flaky issue is resolved
+      skip.browser('webkit', 'Safari is flaky on CI');
+
       await page.goto('/src/components/infinite-scroll/test/top', config);
 
       const ionInfiniteComplete = await page.spyOnEvent('ionInfiniteComplete');

core/src/components/modal/gestures/sheet.ts

@@ -264,11 +264,16 @@ export const createSheetGesture = (
 
   const onMove = (detail: GestureDetail) => {
     /**
-     * If `expandToScroll` is disabled, we should not allow the swipe gesture
-     * to continue if the gesture is not pulling down.
+     * If `expandToScroll` is disabled, and an upwards swipe gesture is done within
+     * the scrollable content, we should not allow the swipe gesture to continue.
      */
     if (!expandToScroll && detail.deltaY <= 0) {
-      return;
+      const contentEl = findClosestIonContent(detail.event.target! as HTMLElement);
+      const scrollEl =
+        contentEl && isIonContent(contentEl) ? getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+      if (scrollEl) {
+        return;
+      }
     }
 
     /**
@@ -324,6 +329,19 @@ export const createSheetGesture = (
   };
 
   const onEnd = (detail: GestureDetail) => {
+    /**
+     * If expandToScroll is disabled, we should not allow the moveSheetToBreakpoint
+     * function to be called if the user is trying to swipe content upwards and the content
+     * is not scrolled to the top.
+     */
+    if (!expandToScroll && detail.deltaY <= 0 && findClosestIonContent(detail.event.target! as HTMLElement)) {
+      const contentEl = findClosestIonContent(detail.event.target! as HTMLElement)!;
+      const scrollEl = isIonContent(contentEl) ? getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+      if (scrollEl!.scrollTop > 0) {
+        return;
+      }
+    }
+
     /**
      * When the gesture releases, we need to determine
      * the closest breakpoint to snap to.