Merge remote-tracking branch 'origin/dev'

Author: juzser

src/components/Popover/components/PopoverOverlay/PopoverOverlay.vue

@@ -48,12 +48,11 @@ import {
 } from 'vue-property-decorator';
 import { classNames } from 'polaris-react/src/utilities/css';
 import { durationFast } from '@shopify/polaris-tokens';
-import type { PreferredAlignment, PreferredPosition } from '../../../PositionedOverlay';
 import {
   PopoverCloseSource, PopoverAutofocusTarget, nodeContainsDescendant, TransitionStatus,
 } from '../../utils';
 import { findFirstFocusableNode } from '@/utilities/focus';
-import { PositionedOverlay } from '../../../PositionedOverlay';
+import { PositionedOverlay, PreferredAlignment, PreferredPosition } from '@/components/PositionedOverlay';
 import { Pane } from '../Pane';
 import styles from '@/classes/Popover.json';
 import { EventListener } from '@/components/EventListener';
@@ -209,13 +208,9 @@ export default class PopoverOverlay extends Vue {
       const focusableChild = findFirstFocusableNode(this.contentNode);
 
       if (focusableChild && autofocusTarget === 'first-node') {
-        focusableChild.focus({
-          preventScroll: process.env.NODE_ENV === 'development',
-        });
+        focusableChild.focus();
       } else {
-        this.contentNode.focus({
-          preventScroll: process.env.NODE_ENV === 'development',
-        });
+        this.contentNode.focus();
       }
     });
   }

src/components/Popover/components/PopoverOverlay/index.ts

@@ -1,2 +1 @@
-export * from './PopoverOverlay.vue';
 export { default as PopoverOverlay } from './PopoverOverlay.vue';

src/components/Popover/components/index.ts

@@ -1 +1,3 @@
 export * from './PopoverOverlay';
+export * from './Pane';
+export * from './Section';

src/components/Popover/index.ts

@@ -1,3 +1,2 @@
 export { default as Popover } from './Popover.vue';
-export * from './components';
-export * from './utils';
+export { Pane, PopoverOverlay, Section } from './components';

src/components/PositionedOverlay/PositionedOverlay.vue

@@ -30,9 +30,10 @@ import {
 import { getRectForNode, Rect } from '@/utilities/geometry';
 import styles from '@/classes/PositionedOverlay.json';
 import popoverStyles from '@/classes/Popover.json';
-import { PopoverAutofocusTarget } from '../Popover/index';
+import { PopoverAutofocusTarget } from '../Popover/utils';
 import { isDocument, getMarginsForNode, getZIndexForLayerFromNode } from './utils';
-import { Scrollable, EventListener } from '@/components';
+import { EventListener } from '../EventListener';
+import { forNode } from '../Scrollable/utils';
 
 const OBSERVER_CONFIG = {
   childList: true,
@@ -44,7 +45,6 @@ type Positioning = 'above' | 'below';
 
 @Component({
   components: {
-    Scrollable,
     EventListener,
   },
 })
@@ -245,7 +245,7 @@ export default class PositionedOverlay extends Vue {
   }
 
   mounted(): void {
-    this.scrollableContainer = Scrollable.forNode(this.activator);
+    this.scrollableContainer = forNode(this.activator);
     if (this.scrollableContainer && !this.fixed) {
       this.scrollableContainer.addEventListener('scroll', this.handleMeasurement);
     }

src/components/Scrollable/Scrollable.vue

@@ -22,7 +22,6 @@ import { classNames } from 'polaris-react/src/utilities/css';
 import { scrollable } from 'polaris-react/src/components/shared';
 import { StickyManager } from '@/utilities/sticky-manager';
 import styles from '@/classes/Scrollable.json';
-import { ScrollTo } from './components';
 import type { ScrollToPositionFn } from './utils';
 
 function prevent(evt: Event) {
@@ -46,13 +45,6 @@ const LOW_RES_BUFFER = 2;
 
 @Component
 export default class Scrollable extends Vue {
-  static ScrollTo = ScrollTo;
-
-  static forNode(node: HTMLElement): HTMLElement | Document {
-    const closestElement = node.closest(scrollable.selector);
-    return closestElement instanceof HTMLElement ? closestElement : document;
-  }
-
   @Provide() 'stickyManager' = new StickyManager();
 
   @Provide() 'scrollToPosition': ScrollToPositionFn;

src/components/Scrollable/index.ts

@@ -1 +1,2 @@
 export { default as Scrollable } from './Scrollable.vue';
+export * from './components';

src/components/Scrollable/utils.ts

@@ -1 +1,8 @@
+import { scrollable } from 'polaris-react/src/components/shared';
+
 export type ScrollToPositionFn = (scrollY: number) => void;
+
+export function forNode(node: HTMLElement): HTMLElement | Document {
+  const closestElement = node.closest(scrollable.selector);
+  return closestElement instanceof HTMLElement ? closestElement : document;
+}

src/components/TextField/TextField.vue

@@ -106,8 +106,10 @@ import CircleCancelMinor from '@shopify/polaris-icons/dist/svg/CircleCancelMinor
 import { classNames, variationName } from 'polaris-react/src/utilities/css';
 import type { Error, Action } from 'types/type';
 import { useUniqueId } from '@/utilities/unique-id';
-import { Connected, Icon, Labelled } from '@/components';
 import { VisuallyHidden } from '../VisuallyHidden';
+import { Connected } from '../Connected';
+import { Icon } from '../Icon';
+import { Labelled } from '../Labelled';
 import { helpTextID, labelID } from '../Labelled/utils';
 import { Resizer, Spinner } from './components';
 import styles from '@/classes/TextField.json';

src/components/TextField/components/Resizer/Resizer.vue

@@ -24,7 +24,7 @@ div(
 import Vue from 'vue';
 import { Component, Prop, Ref } from 'vue-property-decorator';
 import styles from '@/classes/TextField.json';
-import { EventListener } from '@/components';
+import { EventListener } from '@/components/EventListener';
 
 const ENTITIES_TO_REPLACE = {
   '&': '&',