diff --git a/src/components/EditableHeading/__tests__/editableHeading.jest.js b/src/components/EditableHeading/__tests__/editableHeading.jest.js
index 61ca0bffea..f4bc835b24 100644
--- a/src/components/EditableHeading/__tests__/editableHeading.jest.js
+++ b/src/components/EditableHeading/__tests__/editableHeading.jest.js
@@ -1,6 +1,6 @@
import React from "react";
import renderer from "react-test-renderer";
-import { render, cleanup, fireEvent } from "@testing-library/react";
+import { cleanup, fireEvent, render } from "@testing-library/react";
import EditableHeading from "../EditableHeading";
import "@testing-library/jest-dom";
@@ -55,7 +55,7 @@ describe("EditableHeading", () => {
expect(mockCallback.mock.calls.length).toBe(1);
});
-
+
it("should play the onStartEditing function with params when click on the input element inside the EditableHeading element", () => {
const mockCallback = jest.fn(x => console.log(x));
const { getByRole } = render();
diff --git a/src/components/Loader/Loader.jsx b/src/components/Loader/Loader.jsx
index 7b9db96726..7973a218ae 100644
--- a/src/components/Loader/Loader.jsx
+++ b/src/components/Loader/Loader.jsx
@@ -1,7 +1,9 @@
import React, { forwardRef, useMemo } from "react";
import PropTypes from "prop-types";
-import "./Loader.scss";
+import cx from "classnames";
import { backwardCompatibilityForProperties } from "../../helpers/backwardCompatibilityForProperties";
+import { LOADER_COLORS, LOADER_SIZES, LOADER_TYPES } from "components/Loader/LoaderConstants";
+import styles from "./Loader.module.scss";
const Loader = forwardRef(
(
@@ -10,13 +12,15 @@ const Loader = forwardRef(
svgClassName,
className,
size,
+ color,
+ hasBackground,
id
},
ref
) => {
const overrideClassName = backwardCompatibilityForProperties([className, svgClassName], "");
- const style = useMemo(() => {
+ const sizeStyle = useMemo(() => {
if (typeof size === "number") {
return { width: size, height: size };
}
@@ -24,28 +28,69 @@ const Loader = forwardRef(
}, [size]);
return (
-
-