fix(positioning): fix errors on invalid position (#5212)

* fix(positioning): fix errors on invalid position

Author: Domainv

src/datepicker/themes/bs/bs-datepicker-container.component.ts

@@ -46,7 +46,8 @@ export class BsDatepickerContainerComponent extends BsDatepickerAbstractComponen
         flip: {
           enabled: this._config.adaptivePosition
         }
-      }
+      },
+      allowedPositions: ['top', 'bottom']
     });
 
     this.isOtherMonthsActive = this._config.selectFromOtherMonth;

src/datepicker/themes/bs/bs-daterangepicker-container.component.ts

@@ -49,7 +49,8 @@ export class BsDaterangepickerContainerComponent extends BsDatepickerAbstractCom
         flip: {
           enabled: this._config.adaptivePosition
         }
-      }
+      },
+      allowedPositions: ['top', 'bottom']
     });
 
     this.containerClass = this._config.containerClass;

src/dropdown/bs-dropdown.directive.ts

@@ -240,7 +240,7 @@ export class BsDropdownDirective implements OnInit, OnDestroy {
         (typeof this.dropup !== 'undefined' && this.dropup);
       this._state.direction = _dropup ? 'up' : 'down';
       const _placement =
-        this.placement || (_dropup ? 'top left' : 'bottom left');
+        this.placement || (_dropup ? 'top start' : 'bottom start');
 
       // show dropdown
       this._dropdown

src/positioning/models/index.ts

@@ -36,4 +36,5 @@ export interface Options {
       enabled: boolean;
     };
   };
+  allowedPositions?: string[];
 }

src/positioning/modifiers/flip.ts

@@ -41,10 +41,7 @@ export function flip(data: Data): Data {
   const target = data.instance.target;
   const host = data.instance.host;
 
-  const adaptivePosition = variation
-    ? computeAutoPlacement('auto', offsetsHost, target, host, ['top', 'bottom'])
-    : computeAutoPlacement('auto', offsetsHost, target, host);
-
+  const adaptivePosition = computeAutoPlacement('auto', offsetsHost, target, host, data.options.allowedPositions);
   const flipOrder = [placement, adaptivePosition];
 
   /* tslint:disable-next-line: cyclomatic-complexity */

src/positioning/modifiers/initData.ts

@@ -11,15 +11,29 @@ export function initData(
 ): Data {
 
   const hostElPosition = getReferenceOffsets(targetElement, hostElement);
+
+  if (!position.match(/^(auto)*\s*(left|right|top|bottom)*$/)
+    && !position.match(/^(left|right|top|bottom)*\s*(start|end)*$/)) {
+      /* tslint:disable-next-line: no-parameter-reassignment */
+      position = 'auto';
+    }
+
   const placementAuto = !!position.match(/auto/g);
 
   // support old placements 'auto left|right|top|bottom'
-  let placement = !!position.match(/auto\s(left|right|top|bottom)/g)
-    ? position.split(' ')[1] || ''
+  let placement = position.match(/auto\s(left|right|top|bottom)/)
+    ? position.split(' ')[1] || 'auto'
     : position;
 
   const targetOffset = getTargetOffsets(targetElement, hostElPosition, placement);
-  placement = computeAutoPlacement(placement, hostElPosition, targetElement, hostElement);
+
+  placement = computeAutoPlacement(
+    placement,
+    hostElPosition,
+    targetElement,
+    hostElement,
+    options ? options.allowedPositions : undefined
+  );
 
   return {
     options,

src/positioning/modifiers/preventOverflow.ts

@@ -71,7 +71,10 @@ export function preventOverflow(data: Data) {
       ? 'primary'
       : 'secondary';
 
-    data.offsets.target = { ...data.offsets.target, ...(check as any)[side](placement) };
+    data.offsets.target = {
+      ...data.offsets.target,
+      ...(check as any)[side](placement)
+    };
 
   });
 

src/positioning/modifiers/shift.ts

@@ -12,9 +12,9 @@ export function shift(data: Data): Data {
     const measurement = isVertical ? 'width' : 'height';
 
     const shiftOffsets = {
-      left: { [side]: host[side] },
-      right: {
-        [side]: host[side] + host[measurement] - host[measurement]
+      start: { [side]: host[side] },
+      end: {
+        [side]: host[side] + host[measurement] - target[measurement]
       }
     };
 

src/positioning/ng-positioning.ts

@@ -4,7 +4,7 @@
  */
 import { Renderer2 } from '@angular/core';
 
-import { getReferenceOffsets, setAllStyles } from './utils';
+import { getOffsets, getReferenceOffsets, updateContainerClass, setStyles } from './utils';
 
 import { arrow, flip, preventOverflow, shift, initData } from './modifiers';
 import { Data, Offsets, Options } from './models';
@@ -54,5 +54,18 @@ export function positionElements(
     options
   );
 
-  setAllStyles(data, renderer);
+  const offsets = getOffsets(data);
+
+  setStyles(targetElement, {
+    'will-change': 'transform',
+    top: '0px',
+    left: '0px',
+    transform: `translate3d(${offsets.left}px, ${offsets.top}px, 0px)`
+  }, renderer);
+
+  if (data.instance.arrow) {
+    setStyles(data.instance.arrow, data.offsets.arrow, renderer);
+  }
+
+  updateContainerClass(data, renderer);
 }

src/positioning/utils/computeAutoPlacement.ts

@@ -14,7 +14,7 @@ export function computeAutoPlacement(
   refRect: Offsets,
   target: HTMLElement,
   host: HTMLElement,
-  allowedPositions: any[] = ['top', 'left', 'bottom', 'right'],
+  allowedPositions: any[] = ['top', 'bottom', 'right', 'left'],
   boundariesElement = 'viewport',
   padding = 0
 ) {
@@ -52,22 +52,27 @@ export function computeAutoPlacement(
     .sort((a, b) => b.area - a.area);
 
   let filteredAreas: any[] = sortedAreas.filter(
-    ({ width, height }) =>
-      width >= target.clientWidth && height >= target.clientHeight
+    ({ width, height }) => {
+      return width >= target.clientWidth
+        && height >= target.clientHeight;
+    }
   );
 
-  filteredAreas = allowedPositions
-    .reduce((obj, key) => {
-      return { ...obj, [key]: filteredAreas[key] };
-    }, {});
+  filteredAreas = filteredAreas.filter((position: any) => {
+    return allowedPositions
+      .some((allowedPosition: string) => {
+        return allowedPosition === position.key;
+      });
+  });
 
   const computedPlacement: string = filteredAreas.length > 0
     ? filteredAreas[0].key
     : sortedAreas[0].key;
 
   const variation = placement.split(' ')[1];
 
-  target.className = target.className.replace(/auto/g, computedPlacement);
+  // for tooltip on auto position
+  target.className = target.className.replace(/bs-tooltip-auto/g, `bs-tooltip-${computedPlacement}`);
 
   return computedPlacement + (variation ? `-${variation}` : '');
 }