Merge branch 'main' into release/make-web-dist-startable

This commit is contained in:
Lincoln Stein 2023-05-24 10:55:51 -04:00 committed by GitHub
commit bb2c6e5925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View File

@ -80,7 +80,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: set test prompt to main branch validation - name: set test prompt to main branch validation
run:echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> ${{ matrix.github-env }} run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> ${{ matrix.github-env }}
- name: setup python - name: setup python
uses: actions/setup-python@v4 uses: actions/setup-python@v4

View File

@ -8,7 +8,7 @@ type IAICanvasImageProps = {
}; };
const IAICanvasImage = (props: IAICanvasImageProps) => { const IAICanvasImage = (props: IAICanvasImageProps) => {
const { url, x, y } = props; const { url, x, y } = props;
const [image] = useImage(url); const [image] = useImage(url, 'anonymous');
return <Image x={x} y={y} image={image} listening={false} />; return <Image x={x} y={y} image={image} listening={false} />;
}; };

View File

@ -65,6 +65,7 @@ import UpscaleSettings from 'features/parameters/components/Parameters/Upscale/U
import { allParametersSet } from 'features/parameters/store/generationSlice'; import { allParametersSet } from 'features/parameters/store/generationSlice';
import DeleteImageButton from './ImageActionButtons/DeleteImageButton'; import DeleteImageButton from './ImageActionButtons/DeleteImageButton';
import { useAppToaster } from 'app/components/Toaster'; import { useAppToaster } from 'app/components/Toaster';
import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice';
const currentImageButtonsSelector = createSelector( const currentImageButtonsSelector = createSelector(
[ [
@ -335,7 +336,7 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
dispatch(sentImageToCanvas()); dispatch(sentImageToCanvas());
if (isLightboxOpen) dispatch(setIsLightboxOpen(false)); if (isLightboxOpen) dispatch(setIsLightboxOpen(false));
// dispatch(setInitialCanvasImage(selectedImage)); dispatch(setInitialCanvasImage(image));
dispatch(requestCanvasRescale()); dispatch(requestCanvasRescale());
if (activeTabName !== 'unifiedCanvas') { if (activeTabName !== 'unifiedCanvas') {