mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
3.0.1 - Pre-Release UI Fixes (#4001)
## What type of PR is this? (check all applicable) - [x] Feature ## Have you discussed this change with the InvokeAI team? - [x] Yes ## Description - Update the Aspect Ratio tags to show the aspect ratio values rather than Wide / Square and etc. - Updated Lora Input to take values between -50 and 50 coz I found some LoRA that are actually trained to work until -25 and +15 too. So these input caps should mostly suffice. If there's ever a LoRA that goes bonkers on that, we can change it. - Fixed LoRA's being sorted the wrong way in Lora Select. - Fixed Embeddings being sorted the wrong way in Embedding Select. ## Related Tickets & Documents <!-- For pull requests that relate or close an issue, please include them below. For example having the text: "closes #1234" would connect the current pull request to issue 1234. And when we merge the pull request, Github will automatically close the issue. --> - Related Issue # - Closes # ## QA Instructions, Screenshots, Recordings <!-- Please provide steps on how to test changes, any hardware or software specifications as well as any other pertinent information. --> ## Added/updated tests? - [ ] Yes - [ ] No : _please replace this line with details on why tests have not been included_ ## [optional] Are there any post deployment tasks we need to perform?
This commit is contained in:
commit
fda7e0a71a
@ -114,6 +114,11 @@ const IAISlider = (props: IAIFullSliderProps) => {
|
|||||||
setLocalInputValue(value);
|
setLocalInputValue(value);
|
||||||
}, [value]);
|
}, [value]);
|
||||||
|
|
||||||
|
const numberInputMin = useMemo(
|
||||||
|
() => (sliderNumberInputProps?.min ? sliderNumberInputProps.min : min),
|
||||||
|
[min, sliderNumberInputProps?.min]
|
||||||
|
);
|
||||||
|
|
||||||
const numberInputMax = useMemo(
|
const numberInputMax = useMemo(
|
||||||
() => (sliderNumberInputProps?.max ? sliderNumberInputProps.max : max),
|
() => (sliderNumberInputProps?.max ? sliderNumberInputProps.max : max),
|
||||||
[max, sliderNumberInputProps?.max]
|
[max, sliderNumberInputProps?.max]
|
||||||
@ -129,24 +134,23 @@ const IAISlider = (props: IAIFullSliderProps) => {
|
|||||||
const handleInputBlur = useCallback(
|
const handleInputBlur = useCallback(
|
||||||
(e: FocusEvent<HTMLInputElement>) => {
|
(e: FocusEvent<HTMLInputElement>) => {
|
||||||
if (e.target.value === '') {
|
if (e.target.value === '') {
|
||||||
e.target.value = String(min);
|
e.target.value = String(numberInputMin);
|
||||||
}
|
}
|
||||||
const clamped = clamp(
|
const clamped = clamp(
|
||||||
isInteger
|
isInteger
|
||||||
? Math.floor(Number(e.target.value))
|
? Math.floor(Number(e.target.value))
|
||||||
: Number(localInputValue),
|
: Number(localInputValue),
|
||||||
min,
|
numberInputMin,
|
||||||
numberInputMax
|
numberInputMax
|
||||||
);
|
);
|
||||||
const quantized = roundDownToMultiple(clamped, step);
|
const quantized = roundDownToMultiple(clamped, step);
|
||||||
onChange(quantized);
|
onChange(quantized);
|
||||||
setLocalInputValue(quantized);
|
setLocalInputValue(quantized);
|
||||||
},
|
},
|
||||||
[isInteger, localInputValue, min, numberInputMax, onChange, step]
|
[isInteger, localInputValue, numberInputMin, numberInputMax, onChange, step]
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleInputChange = useCallback((v: number | string) => {
|
const handleInputChange = useCallback((v: number | string) => {
|
||||||
console.log('input');
|
|
||||||
setLocalInputValue(v);
|
setLocalInputValue(v);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@ -310,7 +314,7 @@ const IAISlider = (props: IAIFullSliderProps) => {
|
|||||||
|
|
||||||
{withInput && (
|
{withInput && (
|
||||||
<NumberInput
|
<NumberInput
|
||||||
min={min}
|
min={numberInputMin}
|
||||||
max={numberInputMax}
|
max={numberInputMax}
|
||||||
step={step}
|
step={step}
|
||||||
value={localInputValue}
|
value={localInputValue}
|
||||||
|
@ -57,6 +57,11 @@ const ParamEmbeddingPopover = (props: Props) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Sort Alphabetically
|
||||||
|
data.sort((a, b) =>
|
||||||
|
a.label && b.label ? (a.label?.localeCompare(b.label) ? -1 : 1) : -1
|
||||||
|
);
|
||||||
|
|
||||||
return data.sort((a, b) => (a.disabled && !b.disabled ? 1 : -1));
|
return data.sort((a, b) => (a.disabled && !b.disabled ? 1 : -1));
|
||||||
}, [embeddingQueryData, currentMainModel?.base_model]);
|
}, [embeddingQueryData, currentMainModel?.base_model]);
|
||||||
|
|
||||||
|
@ -48,6 +48,7 @@ const ParamLora = (props: Props) => {
|
|||||||
handleReset={handleReset}
|
handleReset={handleReset}
|
||||||
withSliderMarks
|
withSliderMarks
|
||||||
sliderMarks={[-1, 0, 1, 2]}
|
sliderMarks={[-1, 0, 1, 2]}
|
||||||
|
sliderNumberInputProps={{ min: -50, max: 50 }}
|
||||||
/>
|
/>
|
||||||
<IAIIconButton
|
<IAIIconButton
|
||||||
size="sm"
|
size="sm"
|
||||||
|
@ -54,7 +54,12 @@ const ParamLoRASelect = () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
return data.sort((a, b) => (a.disabled && !b.disabled ? 1 : -1));
|
// Sort Alphabetically
|
||||||
|
data.sort((a, b) =>
|
||||||
|
a.label && b.label ? (a.label?.localeCompare(b.label) ? 1 : -1) : -1
|
||||||
|
);
|
||||||
|
|
||||||
|
return data.sort((a, b) => (a.disabled && !b.disabled ? -1 : 1));
|
||||||
}, [loras, loraModels, currentMainModel?.base_model]);
|
}, [loras, loraModels, currentMainModel?.base_model]);
|
||||||
|
|
||||||
const handleChange = useCallback(
|
const handleChange = useCallback(
|
||||||
|
@ -7,9 +7,9 @@ import { activeTabNameSelector } from '../../../../ui/store/uiSelectors';
|
|||||||
|
|
||||||
const aspectRatios = [
|
const aspectRatios = [
|
||||||
{ name: 'Free', value: null },
|
{ name: 'Free', value: null },
|
||||||
{ name: 'Portrait', value: 0.67 / 1 },
|
{ name: '2:3', value: 2 / 3 },
|
||||||
{ name: 'Wide', value: 16 / 9 },
|
{ name: '16:9', value: 16 / 9 },
|
||||||
{ name: 'Square', value: 1 / 1 },
|
{ name: '1:1', value: 1 / 1 },
|
||||||
];
|
];
|
||||||
|
|
||||||
export default function ParamAspectRatio() {
|
export default function ParamAspectRatio() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user