@workday/canvas-kit-react 9.0.0-alpha.344-next.3 → 9.0.0-alpha.350-next.4

package/tokens/lib/type/fontFamilies.ts

@@ -1,9 +1,10 @@
-import get from 'lodash/get';
+// prettier-ignore
+//@ts-ignore
+const canvasObject = typeof window !== 'undefined' && window.workday && window.workday.canvas && window.workday.canvas;
 
-const inheritFont: boolean =
-  typeof window !== 'undefined' && get(window, 'window.workday.canvas.inheritFontFamily');
+const inheritFont: boolean = typeof canvasObject !== 'undefined' && canvasObject.inheritFontFamily;
 const inheritMonoFont: boolean | string =
-  typeof window !== 'undefined' && get(window, 'window.workday.canvas.inheritMonoFontFamily');
+  typeof canvasObject !== 'undefined' && canvasObject.inheritMonoFontFamily;
 
 export const fontFamily = inheritFont
   ? 'inherit'

package/tooltip/lib/useTooltip.tsx

@@ -133,19 +133,26 @@ export function useTooltip<T extends Element = Element>({
 
   const visible = popupModel.state.visibility !== 'hidden';
 
+  const targetProps = {
+    // extra description of the target element for assistive technology
+    'aria-describedby': type === 'describe' && visible ? id : undefined,
+    // This will replace the accessible name of the target element
+    'aria-label': type === 'label' ? titleText : undefined,
+    onMouseEnter: onOpenFromTarget,
+    onMouseLeave: onHide,
+    onMouseDown,
+    onFocus,
+    onBlur: onHide,
+  };
+
+  // remove `aria-describedby` if undefined to not override what's provided
+  if (targetProps['aria-describedby'] === undefined) {
+    delete targetProps['aria-describedby'];
+  }
+
   return {
     /** Mix these properties into the target element. **Must be an Element** */
-    targetProps: {
-      // extra description of the target element for assistive technology
-      'aria-describedby': type === 'describe' && visible ? id : undefined,
-      // This will replace the accessible name of the target element
-      'aria-label': type === 'label' ? titleText : undefined,
-      onMouseEnter: onOpenFromTarget,
-      onMouseLeave: onHide,
-      onMouseDown,
-      onFocus,
-      onBlur: onHide,
-    },
+    targetProps,
     /** Mix these properties into the `Popper` component */
     popperProps: {
       open: visible,