From af4948304f5b95fdc8c642882609b87d39562f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= <francois.chalifour@gmail.com>
Date: Mon, 1 Feb 2021 19:52:28 +0100
Subject: [PATCH] fix(core): forward props in `getEnvironmentProps`

---
 .../src/__tests__/getEnvironmentProps.test.ts | 19 +++++++++-
 .../autocomplete-core/src/getPropGetters.ts   | 37 ++++++++++---------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/packages/autocomplete-core/src/__tests__/getEnvironmentProps.test.ts b/packages/autocomplete-core/src/__tests__/getEnvironmentProps.test.ts
index ac23eea89..001017cb0 100644
--- a/packages/autocomplete-core/src/__tests__/getEnvironmentProps.test.ts
+++ b/packages/autocomplete-core/src/__tests__/getEnvironmentProps.test.ts
@@ -2,7 +2,24 @@ import { createPlayground } from '../../../../test/utils';
 import { createAutocomplete } from '../createAutocomplete';
 
 describe('getEnvironmentProps', () => {
-  test.todo('forwards the remaining props');
+  test('forwards the remaining props', () => {
+    const { getEnvironmentProps, formElement, inputElement } = createPlayground(
+      createAutocomplete,
+      {}
+    );
+    const panelElement = document.createElement('div');
+
+    const environmentProps = getEnvironmentProps({
+      inputElement,
+      formElement,
+      panelElement,
+      customProps: {},
+    });
+
+    expect(environmentProps).toEqual(
+      expect.objectContaining({ customProps: {} })
+    );
+  });
 
   describe('onTouchStart', () => {
     test('is a noop when panel is not open', () => {
diff --git a/packages/autocomplete-core/src/getPropGetters.ts b/packages/autocomplete-core/src/getPropGetters.ts
index 3cfb10675..4f5738537 100644
--- a/packages/autocomplete-core/src/getPropGetters.ts
+++ b/packages/autocomplete-core/src/getPropGetters.ts
@@ -28,7 +28,9 @@ export function getPropGetters<
   TMouseEvent,
   TKeyboardEvent
 >({ props, refresh, store, ...setters }: GetPropGettersOptions<TItem>) {
-  const getEnvironmentProps: GetEnvironmentProps = (getterProps) => {
+  const getEnvironmentProps: GetEnvironmentProps = (providedProps) => {
+    const { inputElement, formElement, panelElement, ...rest } = providedProps;
+
     return {
       // On touch devices, we do not rely on the native `blur` event of the
       // input to close the panel, but rather on a custom `touchstart` event
@@ -38,25 +40,24 @@ export function getPropGetters<
       onTouchStart(event) {
         if (
           store.getState().isOpen === false ||
-          event.target === getterProps.inputElement
+          event.target === inputElement
         ) {
           return;
         }
 
         // @TODO: support cases where there are multiple Autocomplete instances.
         // Right now, a second instance makes this computation return false.
-        const isTargetWithinAutocomplete = [
-          getterProps.formElement,
-          getterProps.panelElement,
-        ].some((contextNode) => {
-          return (
-            isOrContainsNode(contextNode, event.target as Node) ||
-            isOrContainsNode(
-              contextNode,
-              props.environment.document.activeElement!
-            )
-          );
-        });
+        const isTargetWithinAutocomplete = [formElement, panelElement].some(
+          (contextNode) => {
+            return (
+              isOrContainsNode(contextNode, event.target as Node) ||
+              isOrContainsNode(
+                contextNode,
+                props.environment.document.activeElement!
+              )
+            );
+          }
+        );
 
         if (isTargetWithinAutocomplete === false) {
           store.dispatch('blur', null);
@@ -69,15 +70,15 @@ export function getPropGetters<
       onTouchMove(event: TouchEvent) {
         if (
           store.getState().isOpen === false ||
-          getterProps.inputElement !==
-            props.environment.document.activeElement ||
-          event.target === getterProps.inputElement
+          inputElement !== props.environment.document.activeElement ||
+          event.target === inputElement
         ) {
           return;
         }
 
-        getterProps.inputElement.blur();
+        inputElement.blur();
       },
+      ...rest,
     };
   };