From ac69e81b045350724f2bc2ff28ed5ccad2690a67 Mon Sep 17 00:00:00 2001
From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Thu, 27 Feb 2020 01:08:29 +0200
Subject: [PATCH] Turn elements/index into an index (#7135)

---
 src/controllers/controller.bar.js       |  2 +-
 src/controllers/controller.bubble.js    |  2 +-
 src/controllers/controller.doughnut.js  |  2 +-
 src/controllers/controller.line.js      |  3 +--
 src/controllers/controller.polarArea.js |  2 +-
 src/controllers/controller.radar.js     |  3 +--
 src/elements/index.js                   | 15 ++++-----------
 src/index.js                            |  4 +++-
 test/specs/global.namespace.tests.js    |  3 ---
 9 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 69aa5dbe5..eea8cd97c 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Rectangle from '../elements/element.rectangle';
+import {Rectangle} from '../elements/index';
 import {clipArea, unclipArea} from '../helpers/helpers.canvas';
 import {isArray, isNullOrUndef, valueOrDefault} from '../helpers/helpers.core';
 import {_limitValue, sign} from '../helpers/helpers.math';
diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index d4ee27b84..2cad42c24 100644
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Point from '../elements/element.point';
+import {Point} from '../elements/index';
 import {resolve} from '../helpers/helpers.options';
 
 defaults.set('bubble', {
diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 8a59990bb..362125447 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Arc from '../elements/element.arc';
+import {Arc} from '../elements/index';
 import {isArray, valueOrDefault} from '../helpers/helpers.core';
 
 /**
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index bb567060b..5af4eb67c 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -1,7 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Line from '../elements/element.line';
-import Point from '../elements/element.point';
+import {Line, Point} from '../elements/index';
 import {valueOrDefault} from '../helpers/helpers.core';
 import {isNumber} from '../helpers/helpers.math';
 import {resolve} from '../helpers/helpers.options';
diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 125b4b011..28a92fbed 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Arc from '../elements/element.arc';
+import {Arc} from '../elements/index';
 import {toRadians} from '../helpers/helpers.math';
 import {resolve} from '../helpers/helpers.options';
 
diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 3b08c9143..dd6bd4995 100644
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -1,7 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Line from '../elements/element.line';
-import Point from '../elements/element.point';
+import {Line, Point} from '../elements/index';
 import {valueOrDefault} from '../helpers/helpers.core';
 
 defaults.set('radar', {
diff --git a/src/elements/index.js b/src/elements/index.js
index dfb185c2a..df91b3edf 100644
--- a/src/elements/index.js
+++ b/src/elements/index.js
@@ -1,11 +1,4 @@
-import Arc from './element.arc';
-import Line from './element.line';
-import Point from './element.point';
-import Rectangle from './element.rectangle';
-
-export default {
-	Arc,
-	Line,
-	Point,
-	Rectangle
-};
+export {default as Arc} from './element.arc';
+export {default as Line} from './element.line';
+export {default as Point} from './element.point';
+export {default as Rectangle} from './element.rectangle';
diff --git a/src/index.js b/src/index.js
index d1b19287a..46b05d3f1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,5 @@
+/* eslint-disable import/no-namespace, import/namespace */
+
 /**
  * @namespace Chart
  */
@@ -12,7 +14,7 @@ import controllers from './controllers/index';
 import DatasetController from './core/core.datasetController';
 import defaults from './core/core.defaults';
 import Element from './core/core.element';
-import elements from './elements/index';
+import * as elements from './elements/index';
 import Interaction from './core/core.interaction';
 import layouts from './core/core.layouts';
 import platforms from './platform/platforms';
diff --git a/test/specs/global.namespace.tests.js b/test/specs/global.namespace.tests.js
index 975670c3a..36f113a5f 100644
--- a/test/specs/global.namespace.tests.js
+++ b/test/specs/global.namespace.tests.js
@@ -20,9 +20,6 @@ describe('Chart namespace', function() {
 	});
 
 	describe('Chart.elements', function() {
-		it('should be an object', function() {
-			expect(Chart.elements instanceof Object).toBeTruthy();
-		});
 		it('should contains "elements" classes', function() {
 			expect(Chart.elements.Arc instanceof Function).toBeTruthy();
 			expect(Chart.elements.Line instanceof Function).toBeTruthy();
-- 
2.47.2