refactor: make all MachineSettings use new NumberInput (#651)

Co-authored-by: Stefan Dej <[email protected]>
mainsail-crew · Feb 28, 2022 · fef6ba3 · fef6ba3
1 parent 5bfdcf3
commit fef6ba3
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 422 deletions.
diff --git a/components.d.ts b/components.d.ts
@@ -21,7 +21,6 @@ declare module 'vue' {
     FarmPrinterPanel: typeof import('./src/components/panels/FarmPrinterPanel.vue')['default']
     FilamentSensor: typeof import('./src/components/inputs/FilamentSensor.vue')['default']
     FirmwareRetractionSettings: typeof import('./src/components/panels/MachineSettings/FirmwareRetractionSettings.vue')['default']
-    FirmwareRetractionSettingsInput: typeof import('./src/components/inputs/FirmwareRetractionSettingsInput.vue')['default']
     GcodefilesPanel: typeof import('./src/components/panels/GcodefilesPanel.vue')['default']
     HistoryAllPrintStatus: typeof import('./src/components/charts/HistoryAllPrintStatus.vue')['default']
     HistoryFilamentUsage: typeof import('./src/components/charts/HistoryFilamentUsage.vue')['default']
@@ -46,12 +45,10 @@ declare module 'vue' {
     MjpegstreamerAdaptive: typeof import('./src/components/webcams/MjpegstreamerAdaptive.vue')['default']
     MoonrakerStatePanel: typeof import('./src/components/panels/MoonrakerStatePanel.vue')['default']
     MotionSettings: typeof import('./src/components/panels/MachineSettings/MotionSettings.vue')['default']
-    MotionSettingsInput: typeof import('./src/components/inputs/MotionSettingsInput.vue')['default']
     NumberInput: typeof import('./src/components/inputs/NumberInput.vue')['default']
     Panel: typeof import('./src/components/ui/Panel.vue')['default']
     PowerControlPanel: typeof import('./src/components/panels/PowerControlPanel.vue')['default']
     PressureAdvanceSettings: typeof import('./src/components/panels/MachineSettings/PressureAdvanceSettings.vue')['default']
-    PressureAdvanceSettingsInput: typeof import('./src/components/inputs/PressureAdvanceSettingsInput.vue')['default']
     PrinterSelector: typeof import('./src/components/ui/PrinterSelector.vue')['default']
     PrintsettingsPanel: typeof import('./src/components/panels/PrintsettingsPanel.vue')['default']
     SettingsConsoleTab: typeof import('./src/components/settings/SettingsConsoleTab.vue')['default']

diff --git a/src/components/inputs/FirmwareRetractionSettingsInput.vue b/src/components/inputs/FirmwareRetractionSettingsInput.vue
diff --git a/src/components/inputs/MotionSettingsInput.vue b/src/components/inputs/MotionSettingsInput.vue
diff --git a/src/components/inputs/NumberInput.vue b/src/components/inputs/NumberInput.vue
@@ -77,20 +77,20 @@ export default class NumberInput extends Mixins(BaseMixin) {
     declare readonly param: string
 
     // props defining incoming data
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly target: number
 
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly defaultValue: number
 
     // props for internal processing
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly min: number
 
     @Prop({ type: Number, default: null })
     declare readonly max: number | null
 
-    @Prop({ type: Number, required: true, default: 0 })
+    @Prop({ type: Number, required: true })
     declare readonly dec: number
 
     @Prop({ type: Number, required: false, default: 1 })
@@ -147,8 +147,7 @@ export default class NumberInput extends Mixins(BaseMixin) {
 
     submit(): void {
         if (this.invalidInput()) return
-        this.$emit('target-changed', this.param, this.value)
-        this.$emit('submit', this.param)
+        this.$emit('submit', { name: this.param, value: this.value })
     }
 
     // input validation //

diff --git a/src/components/inputs/PressureAdvanceSettingsInput.vue b/src/components/inputs/PressureAdvanceSettingsInput.vue