fix: merge changes

packages/charts/src/chart_types/goal_chart/state/selectors/get_goal_chart_data.ts

@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createCustomCachedSelector } from '../../../../state/create_selector';
+import { geometries } from './geometries';
+
+/** @internal */
+export type GoalChartData = {
+  maximum: number;
+  minimum: number;
+  target: number;
+  value: number;
+};
+
+/** @internal */
+export const getGoalChartDataSelector = createCustomCachedSelector(
+  [geometries],
+  (geoms): GoalChartData => {
+    const goalChartData: GoalChartData = {
+      maximum: geoms.bulletViewModel.highestValue,
+      minimum: geoms.bulletViewModel.lowestValue,
+      target: geoms.bulletViewModel.target,
+      value: geoms.bulletViewModel.actual,
+    };
+    return goalChartData;
+  },
+);
+
+/** @internal */
+export const getGoalChartLabelsSelector = createCustomCachedSelector([geometries], (geoms) => {
+  return { label: geoms.bulletViewModel.labelMajor, minorLabel: geoms.bulletViewModel.labelMinor };
+});

packages/charts/src/chart_types/partition_chart/renderer/canvas/partition.tsx

@@ -21,8 +21,7 @@ import React, { MouseEvent, RefObject } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
 
-import { ScreenReaderSummary } from '../../../../components/accessibility';
-import { ScreenReaderPartitionTable } from '../../../../components/accessibility/partitions_data_table';
+import { ScreenReaderSummary, ScreenReaderPartitionTable } from '../../../../components/accessibility';
 import { clearCanvas } from '../../../../renderers/canvas';
 import { SettingsSpec } from '../../../../specs/settings';
 import { onChartRendered } from '../../../../state/actions/chart';

packages/charts/src/components/accessibility/goal_description.tsx

@@ -17,10 +17,8 @@
  * under the License.
  */
 
-import createCachedSelector from 're-reselect';
-
 import { geometries } from '../../chart_types/goal_chart/state/selectors/geometries';
-import { getChartIdSelector } from '../../state/selectors/get_chart_id';
+import { createCustomCachedSelector } from '../../state/create_selector';
 
 /** @internal */
 export type GoalChartData = {
@@ -31,9 +29,9 @@ export type GoalChartData = {
 };
 
 /** @internal */
-export const getGoalChartDataSelector = createCachedSelector(
+export const getGoalChartDataSelector = createCustomCachedSelector(
   [geometries],
-  (geoms): GoalChartData => {
+  (geoms: any): GoalChartData => {
     const goalChartData: GoalChartData = {
       maximum: geoms.bulletViewModel.highestValue,
       minimum: geoms.bulletViewModel.lowestValue,
@@ -42,4 +40,4 @@ export const getGoalChartDataSelector = createCachedSelector(
     };
     return goalChartData;
   },
-)(getChartIdSelector);
+);

packages/charts/src/components/accessibility/index.ts

@@ -19,3 +19,4 @@
 
 /* @internal */
 export { ScreenReaderSummary } from './screen_reader_summary';
+export { ScreenReaderPartitionTable } from './partitions_data_table';