Merge pull request #1617 from SammyIsConfused/bugfix/allow_wider_cont…

…rols_in_settings_list

Change styles to allow SettingsListControl to support wider controls

Source/Plugins/Core/com.equella.core/js/__stories__/components/SettingsListControl.stories.tsx

@@ -0,0 +1,54 @@
+import * as React from "react";
+import { boolean, number, text } from "@storybook/addon-knobs";
+import SettingsListControl from "../../tsrc/components/SettingsListControl";
+import SettingsToggleSwitch from "../../tsrc/components/SettingsToggleSwitch";
+import { Mark, Slider } from "@material-ui/core";
+import { action } from "@storybook/addon-actions";
+
+export default {
+ title: "SettingsListControl",
+ component: SettingsListControl
+};
+
+const marks: Mark[] = [
+ { label: "Off", value: 0 },
+ { label: "x0.25", value: 1 },
+ { label: "x0.5", value: 2 },
+ { label: "No boost", value: 3 },
+ { label: "x1.5", value: 4 },
+ { label: "x2", value: 5 },
+ { label: "x4", value: 6 },
+ { label: "x8", value: 7 }
+];
+
+export const ToggleSwitchControl = () => (
+ <SettingsListControl
+ secondaryText={text("Secondary Text", "Box for checking")}
+ control={
+ <SettingsToggleSwitch
+ disabled={boolean("Disabled", false)}
+ id={"toggle"}
+ setValue={action("Value of checkbox changed")}
+ value={boolean("Toggle state", false)}
+ />
+ }
+ divider={boolean("divider", false)}
+ primaryText={text("primaryText", "Checkbox")}
+ />
+);
+export const SliderControl = () => (
+ <SettingsListControl
+ secondaryText={text("Secondary Text", "Slide for sliding")}
+ control={
+ <Slider
+ marks={marks}
+ onChangeCommitted={action("Value of slider changed")}
+ min={number("min", 0)}
+ max={number("max", 7)}
+ step={null}
+ />
+ }
+ divider={boolean("divider", false)}
+ primaryText={text("primaryText", "SliderControl")}
+ />
+);

Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/components/SearchSettingFormControl.test.tsx

@@ -1,4 +1,4 @@
-import SearchSettingFormControl from "../../components/SearchSettingFormControl";
+import SearchSettingFormControl from "../../../tsrc/components/SearchSettingFormControl";
 import { TextField } from "@material-ui/core";
 import * as React from "react";
 import { mount, ReactWrapper, shallow } from "enzyme";