Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
23fdbe4
add control_after_generate ui
christian-byrne Oct 4, 2025
f853cb9
don't use forEach
christian-byrne Oct 5, 2025
57025df
seed widget
christian-byrne Oct 8, 2025
cfaeed1
seed widget2
christian-byrne Oct 12, 2025
04bd165
handle legacy step value
christian-byrne Oct 21, 2025
6acc7b0
feat: update NumberControlPopover with semantic design tokens
christian-byrne Nov 13, 2025
29af785
fix test
christian-byrne Nov 14, 2025
c18df9c
Fix display of controled widget values
AustinMroz Nov 25, 2025
abe600b
Revert useGraphNodeManager changes
AustinMroz Nov 25, 2025
fcf9a32
Merge origin/main
AustinMroz Nov 25, 2025
895a458
Swap NumberInputs to rekka ui to embed control
AustinMroz Nov 27, 2025
613fe12
Persist control widget value
AustinMroz Nov 27, 2025
94ade0a
[automated] Update test expectations
invalid-email-address Nov 27, 2025
0fb7466
Test fixes and nits
AustinMroz Nov 27, 2025
95b95ed
Merge branch 'main' into austin/vue-control-after-generate
christian-byrne Nov 30, 2025
69715b2
[automated] Update test expectations
invalid-email-address Nov 30, 2025
7dd2f52
Add max and mins from litegraph implementation
AustinMroz Dec 1, 2025
307771b
Merge 8e006bb8a306^
AustinMroz Dec 3, 2025
bbcb3b4
Merge main
AustinMroz Dec 3, 2025
ec07416
[automated] Update test expectations
invalid-email-address Dec 3, 2025
b5419f7
Empty commit to force tests to rerun
AustinMroz Dec 3, 2025
6d2f976
Fix number precision
AustinMroz Dec 3, 2025
9348995
[automated] Update test expectations
invalid-email-address Dec 3, 2025
9723e2b
Merge main
AustinMroz Dec 3, 2025
bb5c884
[automated] Update test expectations
invalid-email-address Dec 3, 2025
ff08660
Merge main
AustinMroz Dec 3, 2025
52daf4e
Revert to primevue, fix test
AustinMroz Dec 3, 2025
ad70768
Revert vitest changes, clear browser snapshots
AustinMroz Dec 3, 2025
4b4b90d
[automated] Update test expectations
invalid-email-address Dec 3, 2025
a84fd7a
Empty commit to trigger tests
AustinMroz Dec 4, 2025
0b5ded8
Merge main
AustinMroz Dec 5, 2025
a2391e6
[automated] Update test expectations
invalid-email-address Dec 5, 2025
5b6d835
Empty commit to force tests
AustinMroz Dec 5, 2025
939090f
nits
AustinMroz Dec 5, 2025
26e6aec
Further nits
AustinMroz Dec 6, 2025
1fa618c
Merge main
AustinMroz Dec 6, 2025
1ddf364
[automated] Update test expectations
invalid-email-address Dec 6, 2025
cfb579b
Remove global seed tests
AustinMroz Dec 6, 2025
d25cd39
Merge remote-tracking branch 'origin/main' into austin/vue-control-af…
AustinMroz Dec 9, 2025
679a1da
[automated] Update test expectations
invalid-email-address Dec 10, 2025
70f6d5b
merge: main into austin/vue-control-after-generate
christian-byrne Dec 11, 2025
ed25f72
Merge branch 'main' into austin/vue-control-after-generate
AustinMroz Dec 13, 2025
488922a
fix: restore executeNumberControls calls removed in merge
christian-byrne Dec 13, 2025
9553233
fix: remove space-y-1 causing extra margin on number inputs
christian-byrne Dec 13, 2025
437880c
[automated] Update test expectations
invalid-email-address Dec 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
seed widget2
  • Loading branch information
christian-byrne committed Nov 11, 2025
commit cfaeed183ea6de854ca392d60987ce5ff7b1fe29
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@ import ToggleSwitch from 'primevue/toggleswitch'
import { computed, ref } from 'vue'

import { useSettingStore } from '@/platform/settings/settingStore'
import { useDialogService } from '@/services/dialogService'

import { NumberControlMode } from '../composables/useNumberControl'

type ControlSettings = {
linkToGlobal: boolean
randomize: boolean
increment: boolean
decrement: boolean
}
import { NumberControlMode } from '../composables/useStepperControl'

type ControlOption = {
key: keyof ControlSettings
mode: NumberControlMode
icon?: string
title: string
description: string
Expand All @@ -25,33 +19,40 @@ type ControlOption = {

const popover = ref()
const settingStore = useSettingStore()
const dialogService = useDialogService()

const toggle = (event: Event) => {
popover.value.toggle(event)
}
defineExpose({ toggle })

const ENABLE_LINK_TO_GLOBAL = false

const controlOptions: ControlOption[] = [
...(ENABLE_LINK_TO_GLOBAL
? ([
{
mode: NumberControlMode.LINK_TO_GLOBAL,
icon: 'pi pi-link',
title: 'linkToGlobal',
description: 'linkToGlobalDesc'
} satisfies ControlOption
] as ControlOption[])
: []),
{
key: 'linkToGlobal',
icon: 'pi pi-link',
title: 'linkToGlobal',
description: 'linkToGlobalDesc'
},
{
key: 'randomize',
mode: NumberControlMode.RANDOMIZE,
icon: 'icon-[lucide--shuffle]',
title: 'randomize',
description: 'randomizeDesc'
},
{
key: 'increment',
mode: NumberControlMode.INCREMENT,
text: '+1',
title: 'increment',
description: 'incrementDesc'
},
{
key: 'decrement',
mode: NumberControlMode.DECREMENT,
text: '-1',
title: 'decrement',
description: 'decrementDesc'
Expand All @@ -70,16 +71,18 @@ const emit = defineEmits<{
'update:controlMode': [mode: NumberControlMode]
}>()

const handleToggle = (key: keyof ControlSettings) => {
const newMode =
props.controlMode === key
? NumberControlMode.FIXED
: (key as NumberControlMode)
emit('update:controlMode', newMode)
const handleToggle = (mode: NumberControlMode) => {
if (props.controlMode === mode) return
emit('update:controlMode', mode)
}

const isActive = (mode: NumberControlMode) => {
return props.controlMode === mode
}

const isActive = (key: keyof ControlSettings) => {
return props.controlMode === key
const handleEditSettings = () => {
popover.value.hide()
dialogService.showSettingsDialog()
}
</script>

Expand All @@ -101,7 +104,7 @@ const isActive = (key: keyof ControlSettings) => {
<div class="space-y-2">
<div
v-for="option in controlOptions"
:key="option.key"
:key="option.mode"
class="flex items-center justify-between p-2 rounded"
>
<div class="flex gap-3 flex-1">
Expand All @@ -115,7 +118,7 @@ const isActive = (key: keyof ControlSettings) => {
</div>
<div class="min-w-0 flex-1">
<div class="text-sm font-normal">
<span v-if="option.key === 'linkToGlobal'">
<span v-if="option.mode === NumberControlMode.LINK_TO_GLOBAL">
{{ $t('widgets.numberControl.linkToGlobal') }}
<em>{{ $t('widgets.numberControl.linkToGlobalSeed') }}</em>
</span>
Expand All @@ -129,16 +132,21 @@ const isActive = (key: keyof ControlSettings) => {
</div>
</div>
<ToggleSwitch
:model-value="isActive(option.key)"
:model-value="isActive(option.mode)"
class="flex-shrink-0"
@update:model-value="handleToggle(option.key)"
@update:model-value="handleToggle(option.mode)"
/>
</div>
</div>

<hr class="border-charcoal-400 border-1" />

<Button severity="secondary" size="small" class="w-full">
<Button
severity="secondary"
size="small"
class="w-full"
@click="handleEditSettings"
>
<i class="pi pi-cog mr-2 text-xs" />
{{ $t('widgets.numberControl.editSettings') }}
</Button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import InputNumber from 'primevue/inputnumber'
import { computed } from 'vue'
import { computed, watch } from 'vue'

import { useNumberWidgetValue } from '@/composables/graph/useWidgetValue'
import type { SimplifiedWidget } from '@/types/simplifiedWidget'
Expand All @@ -10,6 +10,7 @@ import {
filterWidgetProps
} from '@/utils/widgetPropFilter'

import { useNumberStepCalculation } from '../composables/useNumberStepCalculation'
import { useNumberWidgetButtonPt } from '../composables/useNumberWidgetButtonPt'
import { WidgetInputBaseClass } from './layout'
import WidgetLayoutField from './layout/WidgetLayoutField.vue'
Expand All @@ -29,6 +30,15 @@ const { localValue, onChange } = useNumberWidgetValue(
emit
)

watch(
() => props.modelValue,
(newValue) => {
if (newValue !== localValue.value) {
localValue.value = newValue
}
}
)

const filteredProps = computed(() =>
filterWidgetProps(props.widget.options, INPUT_EXCLUDED_PROPS)
)
Expand All @@ -41,28 +51,10 @@ const precision = computed(() => {
})

// Calculate the step value based on precision or widget options
const stepValue = computed(() => {
// Use step2 (correct input spec value) instead of step (legacy 10x value)
if (props.widget.options?.step2 !== undefined) {
return Number(props.widget.options.step2)
}
// Otherwise, derive from precision
if (precision.value !== undefined) {
if (precision.value === 0) {
return 1
}
// For precision > 0, step = 1 / (10^precision)
// precision 1 → 0.1, precision 2 → 0.01, etc.
return Number((1 / Math.pow(10, precision.value)).toFixed(precision.value))
}
// Default to 'any' for unrestricted stepping
return 0
})
const stepValue = useNumberStepCalculation(props.widget.options, precision)

// Disable grouping separators by default unless explicitly enabled by the node author
const useGrouping = computed(() => {
return props.widget.options?.useGrouping === true
})
const useGrouping = computed(() => props.widget.options?.useGrouping === true)

// Check if increment/decrement buttons should be disabled due to precision limits
const buttonsDisabled = computed(() => {
Expand All @@ -73,6 +65,7 @@ const buttonsDisabled = computed(() => {
)
})

// Tooltip message for disabled buttons
const buttonTooltip = computed(() => {
if (buttonsDisabled.value) {
return 'Increment/decrement disabled: value exceeds JavaScript precision limit (±2^53)'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
filterWidgetProps
} from '@/utils/widgetPropFilter'

import { useNumberStepCalculation } from '../composables/useNumberStepCalculation'
import { useNumberWidgetButtonPt } from '../composables/useNumberWidgetButtonPt'
import { WidgetInputBaseClass } from './layout'
import WidgetLayoutField from './layout/WidgetLayoutField.vue'
Expand All @@ -68,7 +69,7 @@ const updateLocalValue = (newValue: number[] | undefined): void => {
}

const handleNumberInputUpdate = (newValue: number | undefined) => {
if (newValue) {
if (newValue !== undefined) {
updateLocalValue([newValue])
return
}
Expand All @@ -87,25 +88,7 @@ const precision = computed(() => {
})

// Calculate the step value based on precision or widget options
const stepValue = computed(() => {
// Use step2 (correct input spec value) instead of step (legacy 10x value)
if (widget.options?.step2 !== undefined) {
return widget.options.step2
}

// Otherwise, derive from precision
if (precision.value === undefined) {
return undefined
}

if (precision.value === 0) {
return 1
}

// For precision > 0, step = 1 / (10^precision)
// precision 1 → 0.1, precision 2 → 0.01, etc.
return 1 / Math.pow(10, precision.value)
})
const stepValue = useNumberStepCalculation(widget.options, precision, true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this could be a utility function instead of a composable for now.


const buttonsDisabled = computed(() => {
const currentValue = localValue.value ?? 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,51 @@
<script setup lang="ts">
import Button from 'primevue/button'
import { ref } from 'vue'
import { defineAsyncComponent, ref } from 'vue'

import type { SimplifiedWidget } from '@/types/simplifiedWidget'

import { useNumberControl } from '../composables/useNumberControl'
import NumberControlPopover from './NumberControlPopover.vue'
import { useControlButtonIcon } from '../composables/useControlButtonIcon'
import {
NumberControlMode,
useStepperControl
} from '../composables/useStepperControl'
import WidgetInputNumberInput from './WidgetInputNumberInput.vue'

const NumberControlPopover = defineAsyncComponent(
() => import('./NumberControlPopover.vue')
)

const props = defineProps<{
widget: SimplifiedWidget<number>
readonly?: boolean
}>()

const emit = defineEmits<{
'update:modelValue': [value: number]
}>()

const modelValue = defineModel<number>({ default: 0 })
const popover = ref()

const { controlMode } = useNumberControl(modelValue, props.widget.options || {})
const handleControlChange = (newValue: number) => {
modelValue.value = newValue
emit('update:modelValue', newValue)
}

const { controlMode } = useStepperControl(modelValue, {
...props.widget.options,
onChange: handleControlChange
})

if (controlMode.value === NumberControlMode.FIXED) {
controlMode.value = NumberControlMode.RANDOMIZE
}

const controlButtonIcon = useControlButtonIcon(controlMode)

const setControlMode = (mode: NumberControlMode) => {
controlMode.value = mode
}

const togglePopover = (event: Event) => {
popover.value.toggle(event)
Expand All @@ -37,13 +66,13 @@ const togglePopover = (event: Event) => {
class="absolute right-12 top-1/2 -translate-y-1/2 h-4 w-7 p-0 bg-blue-100/30 rounded-xl"
@click="togglePopover"
>
<i class="icon-[lucide--shuffle] text-blue-100" />
<i :class="`${controlButtonIcon} text-blue-100 text-xs`" />
</Button>

<NumberControlPopover
ref="popover"
:control-mode="controlMode"
@update:control-mode="controlMode = $event"
@update:control-mode="setControlMode"
/>
</div>
</template>
Loading