From 7e98fe0addc7f26beaa26111ea25751fca2e1841 Mon Sep 17 00:00:00 2001 From: Abdullah Alfaraj Date: Sat, 10 Jun 2023 12:16:50 +0300 Subject: [PATCH] formate project files with prettier --- .prettierignore | 8 +- index.html | 1 - index.js | 73 +- sdapi_py_re.js | 37 +- typescripts/@types/custom.d.ts | 10 +- typescripts/@types/sdapi_py_re.d.ts | 5 +- typescripts/@types/uxp.d.ts | 6 +- typescripts/after_detailer/after_detailer.tsx | 6 +- typescripts/after_detailer/config.ts | 2 +- .../after_detailer/style/after_detailer.css | 2 +- typescripts/controlnet/ControlNetTab.tsx | 189 +++-- typescripts/controlnet/ControlNetUnit.tsx | 755 +++++++++++------- typescripts/controlnet/entry.ts | 49 +- typescripts/controlnet/main.tsx | 13 +- typescripts/controlnet/store.ts | 76 +- typescripts/controlnet/util.tsx | 34 +- typescripts/entry.ts | 13 - typescripts/main/astore.ts | 2 +- .../ultimate_sd_upscaler.tsx | 16 +- typescripts/util/elements.tsx | 145 ++-- typescripts/util/logger.ts | 10 +- typescripts/util/oldSystem.tsx | 6 +- utility/presets/preset.js | 4 +- webpack.config.js | 11 +- 24 files changed, 884 insertions(+), 589 deletions(-) diff --git a/.prettierignore b/.prettierignore index ac336ae..37b9bf0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,9 @@ server/python_server/output/* *.md -manifest.json \ No newline at end of file +manifest.json +jimp/** +server_env/** +.github\workflows\wiki-sync-action.yml +**/dist +.github\workflows\wiki-sync-action.yml +tsconfig.json \ No newline at end of file diff --git a/index.html b/index.html index cef182f..5efd63b 100644 --- a/index.html +++ b/index.html @@ -991,7 +991,6 @@
-
{ try { _log(data, ...optional_param) - + // const error = new Error({ data, ...optional_param }); - const formattedOutput = logger.formateLog(data,...optional_param) - io.IOLog.saveLogToFile({log:formattedOutput }, 'log.txt') - - } catch (e) { + const formattedOutput = logger.formateLog(data, ...optional_param) + io.IOLog.saveLogToFile({ log: formattedOutput }, 'log.txt') + } catch (e) { _warn('error while logging: ') _warn(e) } - } console.warn = (data, ...optional_param) => { try { - _warn(data, ...optional_param); - const error = new Error(); - const stackTrace = error.stack; - const formattedOutput = logger.formateLog(data,...optional_param) - io.IOLog.saveLogToFile({ warning: formattedOutput,stackTrace }, 'log.txt'); + _warn(data, ...optional_param) + const error = new Error() + const stackTrace = error.stack + const formattedOutput = logger.formateLog(data, ...optional_param) + io.IOLog.saveLogToFile( + { warning: formattedOutput, stackTrace }, + 'log.txt' + ) } catch (e) { - _warn('error while logging: '); - _warn(e); + _warn('error while logging: ') + _warn(e) } } - - + console.error = (data, ...optional_param) => { try { - _error(data, ...optional_param); - const error = new Error(); - const stackTrace = error.stack; - const formattedOutput = logger.formateLog(data,...optional_param) - io.IOLog.saveLogToFile({ error: formattedOutput,stackTrace }, 'log.txt'); + _error(data, ...optional_param) + const error = new Error() + const stackTrace = error.stack + const formattedOutput = logger.formateLog(data, ...optional_param) + io.IOLog.saveLogToFile( + { error: formattedOutput, stackTrace }, + 'log.txt' + ) } catch (e) { - _error('error while logging: '); - _error(e); + _error('error while logging: ') + _error(e) } - } } - - - - - - - - - - - - // const ultimate_sd_upscaler_script_test = require('./ultimate_sd_upscaler/dist/main') // const { @@ -4817,4 +4810,4 @@ Array.from(document.querySelectorAll('.rbSubTab')).forEach((rb) => { // this.shadowRoot.innerHTML = '

Hello World!

' // } // } -// customElements.define('custom-element', CustomElement) \ No newline at end of file +// customElements.define('custom-element', CustomElement) diff --git a/sdapi_py_re.js b/sdapi_py_re.js index 2079602..8b96c91 100644 --- a/sdapi_py_re.js +++ b/sdapi_py_re.js @@ -4,11 +4,8 @@ const { getExtensionType } = require('./utility/html_manip') const py_re = require('./utility/sdapi/python_replacement') const Enum = require('./enum') const { control_net } = require('./typescripts/dist/bundle') -const { - mapPluginSettingsToControlNet, - getEnableControlNet, - getModuleDetail, -} = control_net +const { mapPluginSettingsToControlNet, getEnableControlNet, getModuleDetail } = + control_net const api = require('./utility/api') //javascript plugin can't read images from local directory so we send a request to local server to read the image file and send it back to plugin as image string base64 @@ -483,13 +480,13 @@ async function requestControlNetTxt2Img(plugin_settings) { app.showAlert('you need to select a valid ControlNet Module') throw 'you need to select a valid ControlNet Module' } - + if ( - !control_net_settings['controlnet_units'][index]['model'] && - !getModuleDetail()[ - control_net_settings['controlnet_units'][index]['module'] - ].model_free - || control_net_settings['controlnet_units'][index]['model'] === 'none' + (!control_net_settings['controlnet_units'][index]['model'] && + !getModuleDetail()[ + control_net_settings['controlnet_units'][index]['module'] + ].model_free) || + control_net_settings['controlnet_units'][index]['model'] === 'none' ) { app.showAlert('you need to select a valid ControlNet Model') throw 'you need to select a valid ControlNet Model' @@ -525,10 +522,7 @@ async function requestControlNetTxt2Img(plugin_settings) { mask_index >= numberOfAnnotations ) continue - control_net.setControlMaskSrc( - base64_mask[mask_index], - index - ) + control_net.setControlMaskSrc(base64_mask[mask_index], index) g_generation_session.controlNetMask[index] = base64_mask[mask_index] mask_index++ } @@ -569,10 +563,10 @@ async function requestControlNetImg2Img(plugin_settings) { throw 'you need to select a valid ControlNet Module' } if ( - !control_net_settings['controlnet_units'][index]['model'] && - !getModuleDetail()[ - control_net_settings['controlnet_units'][index]['module'] - ].model_free || + (!control_net_settings['controlnet_units'][index]['model'] && + !getModuleDetail()[ + control_net_settings['controlnet_units'][index]['module'] + ].model_free) || control_net_settings['controlnet_units'][index]['model'] === 'none' ) { app.showAlert('you need to select a valid ControlNet Model') @@ -618,10 +612,7 @@ async function requestControlNetImg2Img(plugin_settings) { mask_index >= numberOfAnnotations ) continue - control_net.setControlMaskSrc( - base64_mask[mask_index], - index - ) + control_net.setControlMaskSrc(base64_mask[mask_index], index) g_generation_session.controlNetMask[index] = base64_mask[mask_index] mask_index++ } diff --git a/typescripts/@types/custom.d.ts b/typescripts/@types/custom.d.ts index ad8db2e..1028c74 100644 --- a/typescripts/@types/custom.d.ts +++ b/typescripts/@types/custom.d.ts @@ -1,6 +1,8 @@ declare module '*.svg' { - import React = require('react'); - export const ReactComponent: React.FunctionComponent>; - const src: string; - export default src; + import React = require('react') + export const ReactComponent: React.FunctionComponent< + React.SVGProps + > + const src: string + export default src } diff --git a/typescripts/@types/sdapi_py_re.d.ts b/typescripts/@types/sdapi_py_re.d.ts index 337cdc7..3f901e5 100644 --- a/typescripts/@types/sdapi_py_re.d.ts +++ b/typescripts/@types/sdapi_py_re.d.ts @@ -1,5 +1,4 @@ - declare module 'sdapi_py_re' { - const exports: any; - export = exports; + const exports: any + export = exports } diff --git a/typescripts/@types/uxp.d.ts b/typescripts/@types/uxp.d.ts index 3d65465..151d550 100644 --- a/typescripts/@types/uxp.d.ts +++ b/typescripts/@types/uxp.d.ts @@ -1,5 +1,5 @@ declare module 'uxp' { - // Add type declarations for the uxp module here - export const storage: any; - export const versions: any; + // Add type declarations for the uxp module here + export const storage: any + export const versions: any } diff --git a/typescripts/after_detailer/after_detailer.tsx b/typescripts/after_detailer/after_detailer.tsx index 8098936..12680b2 100644 --- a/typescripts/after_detailer/after_detailer.tsx +++ b/typescripts/after_detailer/after_detailer.tsx @@ -4,11 +4,7 @@ import ReactDOM from 'react-dom/client' // import { action, makeAutoObservable, reaction, toJS } from 'mobx' import { observer } from 'mobx-react' -import { - SliderType, - SpMenu, - SpSliderWithLabel, -} from '../util/elements' +import { SliderType, SpMenu, SpSliderWithLabel } from '../util/elements' // import * as sdapi from '../../sdapi_py_re' import { api } from '../util/oldSystem' import { AStore } from '../main/astore' diff --git a/typescripts/after_detailer/config.ts b/typescripts/after_detailer/config.ts index 5fd2bbd..9175e4b 100644 --- a/typescripts/after_detailer/config.ts +++ b/typescripts/after_detailer/config.ts @@ -9,7 +9,7 @@ export const model_list = [ 'person_yolov8n-seg.pt', 'person_yolov8s-seg.pt', - 'None' + 'None', ] export let ui_config = { ad_model: { diff --git a/typescripts/after_detailer/style/after_detailer.css b/typescripts/after_detailer/style/after_detailer.css index 6a17902..89e93ad 100644 --- a/typescripts/after_detailer/style/after_detailer.css +++ b/typescripts/after_detailer/style/after_detailer.css @@ -25,4 +25,4 @@ .triangle { background-color: transparent; -} \ No newline at end of file +} diff --git a/typescripts/controlnet/ControlNetTab.tsx b/typescripts/controlnet/ControlNetTab.tsx index 8185b7f..446d5a4 100644 --- a/typescripts/controlnet/ControlNetTab.tsx +++ b/typescripts/controlnet/ControlNetTab.tsx @@ -1,56 +1,81 @@ -import { observer } from 'mobx-react'; -import React from 'react'; -import ControlNetUnit from './ControlNetUnit'; -import { store as ControlNetStore } from './main'; -import { DefaultControlNetUnitData } from './store'; -import { Enum, controlnet_preset, note, preset, selection } from '../util/oldSystem'; -import {SpMenuComponent} from '../util/elements'; +import { observer } from 'mobx-react' +import React from 'react' +import ControlNetUnit from './ControlNetUnit' +import { store as ControlNetStore } from './main' +import { DefaultControlNetUnitData } from './store' +import { + Enum, + controlnet_preset, + note, + preset, + selection, +} from '../util/oldSystem' +import { SpMenuComponent } from '../util/elements' -let g_controlnet_presets: any; -declare const g_generation_session: any; +let g_controlnet_presets: any +declare const g_generation_session: any @observer -class ControlNetTab extends React.Component<{ appState: typeof ControlNetStore }>{ +class ControlNetTab extends React.Component<{ + appState: typeof ControlNetStore +}> { state = { maxControlNet: 0, - presetMenuChildren: [] + presetMenuChildren: [], } // private presetMenuChildren: JSX.Element[] = [] onPresetMenuChange(evt: any) { - const preset_index = evt.target.selectedIndex const preset_name = evt.target.options[preset_index].textContent ControlNetStore.controlNetUnitData.forEach((dataitem, index) => { const presetData = g_controlnet_presets[preset_name][index] || {} - dataitem.enabled = presetData.enabled || DefaultControlNetUnitData.enabled - dataitem.input_image = presetData.input_image || DefaultControlNetUnitData.input_image + dataitem.enabled = + presetData.enabled || DefaultControlNetUnitData.enabled + dataitem.input_image = + presetData.input_image || DefaultControlNetUnitData.input_image dataitem.mask = presetData.mask || DefaultControlNetUnitData.mask - dataitem.module = presetData.module || DefaultControlNetUnitData.module + dataitem.module = + presetData.module || DefaultControlNetUnitData.module dataitem.model = presetData.model || DefaultControlNetUnitData.model - dataitem.weight = presetData.weight || DefaultControlNetUnitData.weight - dataitem.resize_mode = presetData.resize_mode || DefaultControlNetUnitData.resize_mode - dataitem.lowvram = presetData.lowvram || DefaultControlNetUnitData.lowvram - dataitem.processor_res = presetData.processor_res || DefaultControlNetUnitData.processor_res - dataitem.threshold_a = presetData.threshold_a || DefaultControlNetUnitData.threshold_a - dataitem.threshold_b = presetData.threshold_b || DefaultControlNetUnitData.threshold_b - dataitem.guidance_start = presetData.guidance_start || DefaultControlNetUnitData.guidance_start - dataitem.guidance_end = presetData.guidance_end || DefaultControlNetUnitData.guidance_end - dataitem.guessmode = presetData.guessmode || DefaultControlNetUnitData.guessmode + dataitem.weight = + presetData.weight || DefaultControlNetUnitData.weight + dataitem.resize_mode = + presetData.resize_mode || DefaultControlNetUnitData.resize_mode + dataitem.lowvram = + presetData.lowvram || DefaultControlNetUnitData.lowvram + dataitem.processor_res = + presetData.processor_res || + DefaultControlNetUnitData.processor_res + dataitem.threshold_a = + presetData.threshold_a || DefaultControlNetUnitData.threshold_a + dataitem.threshold_b = + presetData.threshold_b || DefaultControlNetUnitData.threshold_b + dataitem.guidance_start = + presetData.guidance_start || + DefaultControlNetUnitData.guidance_start + dataitem.guidance_end = + presetData.guidance_end || + DefaultControlNetUnitData.guidance_end + dataitem.guessmode = + presetData.guessmode || DefaultControlNetUnitData.guessmode - dataitem.control_mode = presetData.control_mode || DefaultControlNetUnitData.control_mode - dataitem.pixel_perfect = presetData.pixel_perfect || DefaultControlNetUnitData.pixel_perfect + dataitem.control_mode = + presetData.control_mode || + DefaultControlNetUnitData.control_mode + dataitem.pixel_perfect = + presetData.pixel_perfect || + DefaultControlNetUnitData.pixel_perfect }) } - // function to update presetMenuChildren - updatePresetMenuChildren(newChildren:any) { - this.setState({ presetMenuChildren: newChildren }); - } + // function to update presetMenuChildren + updatePresetMenuChildren(newChildren: any) { + this.setState({ presetMenuChildren: newChildren }) + } async updatePresetMenuEvent() { - const custom_presets = await preset.getAllCustomPresetsSettings( Enum.PresetTypeEnum['ControlNetPreset'] ) @@ -63,11 +88,26 @@ class ControlNetTab extends React.Component<{ appState: typeof ControlNetStore } const presets_names = Object.keys(g_controlnet_presets) // debugger; - const presetMenuChildren = presets_names.map(preset_name => { - if (preset_name == "Select CtrlNet Preset") - return {preset_name} + const presetMenuChildren = presets_names.map((preset_name) => { + if (preset_name == 'Select CtrlNet Preset') + return ( + + {preset_name} + + ) else - return {preset_name} + return ( + + {preset_name} + + ) }) this.updatePresetMenuChildren(presetMenuChildren) } @@ -75,7 +115,8 @@ class ControlNetTab extends React.Component<{ appState: typeof ControlNetStore } async onSetAllControlImage() { const selectionInfo = await selection.Selection.getSelectionInfoExe() if (selectionInfo) { - const base64_image = await g_generation_session.setControlNetImageHelper() + const base64_image = + await g_generation_session.setControlNetImageHelper() ControlNetStore.controlNetUnitData.forEach(async (data) => { data.input_image = base64_image @@ -101,22 +142,23 @@ class ControlNetTab extends React.Component<{ appState: typeof ControlNetStore } id="mControlNetPresetMenu" value="Select CtrlNet Preset" onChange={this.onPresetMenuChange.bind(this)} - onUpdatePresetMenuEvent={this.updatePresetMenuEvent.bind(this)} + onUpdatePresetMenuEvent={this.updatePresetMenuEvent.bind( + this + )} > - {this.state.presetMenuChildren.map(child => child)} + {this.state.presetMenuChildren.map((child) => child)}
- { - this.props.appState.maxControlNet == 0 && ( - - The Controlnet Extension is missing from Automatic1111. - Please install it to use it through the plugin. - ) - } + {this.props.appState.maxControlNet == 0 && ( + + The Controlnet Extension is missing from Automatic1111. + Please install it to use it through the plugin. + + )}
- Disable ControlNet Tab + + Disable ControlNet Tab +
- - { - Array(this.props.appState.maxControlNet * 2).fill(0).map((v, index) => { - if (index % 2 == 0) { - return
- } - else { - return - } - }) - } + {Array(this.props.appState.maxControlNet * 2) + .fill(0) + .map((v, index) => { + if (index % 2 == 0) { + return ( +
+ + + +
+ ) + } else { + return ( + + ) + } + })}
- ); + ) } } - -export default ControlNetTab; +export default ControlNetTab diff --git a/typescripts/controlnet/ControlNetUnit.tsx b/typescripts/controlnet/ControlNetUnit.tsx index 5bd607f..ca1e938 100644 --- a/typescripts/controlnet/ControlNetUnit.tsx +++ b/typescripts/controlnet/ControlNetUnit.tsx @@ -1,107 +1,168 @@ -import { observer } from 'mobx-react'; -import React from 'react'; -import { MoveToCanvasSvg,ActionButtonSVG, SpCheckBox, SpMenu, SpSlider, Thumbnail, PenSvg, PreviewSvg } from '../util/elements'; -import ControlNetStore from './store'; -import { mapRange, versionCompare } from './util'; -import { note, selection, html_manip, psapi,api, general } from '../util/oldSystem'; - - -declare const g_generation_session: any; -declare const io: any; -declare const app: any; -declare let g_sd_url: string; +import { observer } from 'mobx-react' +import React from 'react' +import { + MoveToCanvasSvg, + ActionButtonSVG, + SpCheckBox, + SpMenu, + SpSlider, + Thumbnail, + PenSvg, + PreviewSvg, +} from '../util/elements' +import ControlNetStore from './store' +import { mapRange, versionCompare } from './util' +import { + note, + selection, + html_manip, + psapi, + api, + general, +} from '../util/oldSystem' +declare const g_generation_session: any +declare const io: any +declare const app: any +declare let g_sd_url: string @observer -export default class ControlNetUnit extends React.Component<{ index: number, appState: typeof ControlNetStore }, {}> { - +export default class ControlNetUnit extends React.Component< + { index: number; appState: typeof ControlNetStore }, + {} +> { onEnableChange(event: any) { event.preventDefault() - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - storeData.enabled = !storeData.enabled; + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.enabled = !storeData.enabled } onLowVRamChange(event: any) { event.preventDefault() - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - storeData.lowvram = !storeData.lowvram; + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.lowvram = !storeData.lowvram } onGuessModeChange(event: any) { event.preventDefault() - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - storeData.guessmode = !storeData.guessmode; + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.guessmode = !storeData.guessmode } onPixelPerfectChange(event: any) { event.preventDefault() - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - console.log('onPixelPerfectChange', storeData.pixel_perfect); - storeData.pixel_perfect = !storeData.pixel_perfect; + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + console.log('onPixelPerfectChange', storeData.pixel_perfect) + storeData.pixel_perfect = !storeData.pixel_perfect } onWeightMove(event: any) { event.preventDefault() - if (event.target.tagName != 'SP-SLIDER') return; - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - storeData.weight = +mapRange(event.target.value, 0, 200, 0, 2, 0.01).toFixed(2); + if (event.target.tagName != 'SP-SLIDER') return + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.weight = +mapRange( + event.target.value, + 0, + 200, + 0, + 2, + 0.01 + ).toFixed(2) } onGuidanceStartMove(event: any) { event.preventDefault() - if (event.target.tagName != 'SP-SLIDER') return; - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - storeData.guidance_start = +mapRange(event.target.value, 0, 10, 0, 1, 0.1).toFixed(1); + if (event.target.tagName != 'SP-SLIDER') return + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.guidance_start = +mapRange( + event.target.value, + 0, + 10, + 0, + 1, + 0.1 + ).toFixed(1) } onGuidanceEndMove(event: any) { event.preventDefault() - if (event.target.tagName != 'SP-SLIDER') return; - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - storeData.guidance_end = +mapRange(event.target.value, 0, 10, 0, 1, 0.1).toFixed(1); + if (event.target.tagName != 'SP-SLIDER') return + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.guidance_end = +mapRange( + event.target.value, + 0, + 10, + 0, + 1, + 0.1 + ).toFixed(1) } - onPreprocsesorChange(event: any, { index, item }: { index: number, item: string }) { - const storeData = this.props.appState.controlNetUnitData[this.props.index]; + onPreprocsesorChange( + event: any, + { index, item }: { index: number; item: string } + ) { + const storeData = + this.props.appState.controlNetUnitData[this.props.index] storeData.module = item } - onModelChange(event: any, { index, item }: { index: number, item: string }) { - const storeData = this.props.appState.controlNetUnitData[this.props.index]; + onModelChange( + event: any, + { index, item }: { index: number; item: string } + ) { + const storeData = + this.props.appState.controlNetUnitData[this.props.index] storeData.model = item } onResolutionMove(event: any) { event.preventDefault() - if (event.target.tagName != 'SP-SLIDER') return; - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - let resolutionConfig = this.props.appState.preprocessorDetail[storeData.module] || {}; - let sliderConfig = resolutionConfig.sliders[0]; - storeData.processor_res = +(event.target.value * (sliderConfig.step || 1)); + if (event.target.tagName != 'SP-SLIDER') return + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + let resolutionConfig = + this.props.appState.preprocessorDetail[storeData.module] || {} + let sliderConfig = resolutionConfig.sliders[0] + storeData.processor_res = +( + event.target.value * (sliderConfig.step || 1) + ) } onThresholdAMove(event: any) { event.preventDefault() - if (event.target.tagName != 'SP-SLIDER') return; - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - let resolutionConfig = this.props.appState.preprocessorDetail[storeData.module] || {}; - let sliderConfig = resolutionConfig.sliders[1]; - storeData.threshold_a = +(event.target.value * (sliderConfig.step || 1)); + if (event.target.tagName != 'SP-SLIDER') return + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + let resolutionConfig = + this.props.appState.preprocessorDetail[storeData.module] || {} + let sliderConfig = resolutionConfig.sliders[1] + storeData.threshold_a = +(event.target.value * (sliderConfig.step || 1)) } onThresholdBMove(event: any) { event.preventDefault() - if (event.target.tagName != 'SP-SLIDER') return; - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - let resolutionConfig = this.props.appState.preprocessorDetail[storeData.module] || {}; - let sliderConfig = resolutionConfig.sliders[2]; - storeData.threshold_b = +(event.target.value * (sliderConfig.step || 1)); + if (event.target.tagName != 'SP-SLIDER') return + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + let resolutionConfig = + this.props.appState.preprocessorDetail[storeData.module] || {} + let sliderConfig = resolutionConfig.sliders[2] + storeData.threshold_b = +(event.target.value * (sliderConfig.step || 1)) } async onSetImageButtonClick() { const selectionInfo = await selection.Selection.getSelectionInfoExe() if (selectionInfo) { - const base64_image = await g_generation_session.setControlNetImageHelper() + const base64_image = + await g_generation_session.setControlNetImageHelper() - this.props.appState.controlNetUnitData[this.props.index].input_image = base64_image + this.props.appState.controlNetUnitData[ + this.props.index + ].input_image = base64_image } else { await note.Notification.inactiveSelectionArea() } } async onMaskButtonClick() { - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - if ( - g_generation_session.control_net_selection_info && - storeData.mask - ) { + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + if (g_generation_session.control_net_selection_info && storeData.mask) { const selection_info = g_generation_session.control_net_selection_info const layer = await io.IO.base64ToLayer( @@ -119,11 +180,11 @@ export default class ControlNetUnit extends React.Component<{ index: number, app } async requestControlNetDetectMap( - controlnet_init_image:string, - _module:string, - processor_res:number, - threshold_a:number, - threshold_b:number + controlnet_init_image: string, + _module: string, + processor_res: number, + threshold_a: number, + threshold_b: number ) { try { const payload = { @@ -134,9 +195,9 @@ export default class ControlNetUnit extends React.Component<{ index: number, app controlnet_threshold_b: threshold_b, } const full_url = `${g_sd_url}/controlnet/detect` - + const response_data = await api.requestPost(full_url, payload) - + // update the mask preview with the new detectMap if (response_data['images'].length === 0) { app.showAlert(response_data['info']) @@ -146,19 +207,18 @@ export default class ControlNetUnit extends React.Component<{ index: number, app console.warn('requestControlNetDetectMap(): ', _module, e) } } - - async previewAnnotator() { + async previewAnnotator() { const index = this.props.index try { - const storeData = this.props.appState.controlNetUnitData[index]; - + const storeData = this.props.appState.controlNetUnitData[index] + const controlnet_init_image = storeData.input_image - - const _module = storeData.module || 'none'; - const processor_res = storeData.processor_res - const threshold_a = storeData.threshold_a - const threshold_b = storeData.threshold_b + + const _module = storeData.module || 'none' + const processor_res = storeData.processor_res + const threshold_a = storeData.threshold_a + const threshold_b = storeData.threshold_b if (!controlnet_init_image) { const error = 'ControlNet initial image is empty' @@ -170,7 +230,7 @@ export default class ControlNetUnit extends React.Component<{ index: number, app app.showAlert(error) throw error } - + const detect_map = await this.requestControlNetDetectMap( controlnet_init_image, _module, @@ -178,19 +238,18 @@ export default class ControlNetUnit extends React.Component<{ index: number, app threshold_a, threshold_b ) - + const rgb_detect_map_url = await io.convertBlackAndWhiteImageToRGBChannels3(detect_map) const rgb_detect_map = general.base64UrlToBase64(rgb_detect_map_url) g_generation_session.controlNetMask[index] = rgb_detect_map - + storeData.mask = rgb_detect_map - } catch (e) { console.warn('PreviewAnnotator click(): index: ', index, e) } } - async toCanvas() { + async toCanvas() { if ( g_generation_session.control_net_preview_selection_info && g_generation_session.controlNetMask[this.props.index] @@ -211,8 +270,10 @@ export default class ControlNetUnit extends React.Component<{ index: number, app } } async toControlNetInitImage() { - const preview_result_base64 = g_generation_session.controlNetMask[this.props.index] - g_generation_session.controlNetImage[this.props.index] = preview_result_base64 + const preview_result_base64 = + g_generation_session.controlNetMask[this.props.index] + g_generation_session.controlNetImage[this.props.index] = + preview_result_base64 g_generation_session.control_net_selection_info = g_generation_session.control_net_preview_selection_info @@ -224,36 +285,40 @@ export default class ControlNetUnit extends React.Component<{ index: number, app // g_generation_session.controlNetMask[index] = rgb_detect_map // html_manip.setControlImageSrc(rgb_detect_map_url, this.props.index) - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + storeData.input_image = storeData.mask } - async previewAnnotatorFromCanvas() { + async previewAnnotatorFromCanvas() { try { - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - const _module = storeData.module || 'none'; - + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + const _module = storeData.module || 'none' + const width = html_manip.getWidth() const height = html_manip.getHeight() const selectionInfo = await psapi.getSelectionInfoExe() - g_generation_session.control_net_preview_selection_info = selectionInfo - const base64 = await io.IO.getSelectionFromCanvasAsBase64Interface_New( - width, - height, - selectionInfo, - true - ) - + g_generation_session.control_net_preview_selection_info = + selectionInfo + const base64 = + await io.IO.getSelectionFromCanvasAsBase64Interface_New( + width, + height, + selectionInfo, + true + ) + if (!_module || _module === 'none') { const error = 'select a valid controlnet module (preprocessor)' app.showAlert(error) throw error } - + const processor_res = storeData.processor_res const threshold_a = storeData.threshold_a const threshold_b = storeData.threshold_b - + const detect_map = await this.requestControlNetDetectMap( base64, _module, @@ -261,203 +326,341 @@ export default class ControlNetUnit extends React.Component<{ index: number, app threshold_a, threshold_b ) - + const rgb_detect_map_url = await io.convertBlackAndWhiteImageToRGBChannels3(detect_map) g_generation_session.controlNetMask[this.props.index] = detect_map - + storeData.mask = general.base64UrlToBase64(rgb_detect_map_url) } catch (e) { - console.warn('PreviewAnnotator click(): index: ', this.props.index, e) + console.warn( + 'PreviewAnnotator click(): index: ', + this.props.index, + e + ) } } render() { - const storeData = this.props.appState.controlNetUnitData[this.props.index]; - const pd = this.props.appState.preprocessorDetail[storeData.module] || {}; - const ppSlider = pd.sliders || []; + const storeData = + this.props.appState.controlNetUnitData[this.props.index] + const pd = + this.props.appState.preprocessorDetail[storeData.module] || {} + const ppSlider = pd.sliders || [] - console.log("pixel_perfect:" + storeData.pixel_perfect); + console.log('pixel_perfect:' + storeData.pixel_perfect) - return
-
- Control Net Settings Slot {this.props.index} -
-
-
-
- + return ( +
+
+ + Control Net Settings Slot {this.props.index} + +
+
+
+
+ +
+
+ +
-
- +
+
+ + + + + + + + + + + + +
+
+ +
-
-
- - - - - - - -
-
- -
-
-
+ ControlNet + + + )} - Enable - Low VRAM - 1 ? 'none' : void 0, marginRight: "10px"}} onChange={this.onGuessModeChange.bind(this)} checked={storeData.guessmode} id={`chGuessMode_${this.props.index}`}>Guess Mode - 1 ? void 0 : 'none', marginRight: "10px"}} onChange={this.onPixelPerfectChange.bind(this)} checked={storeData.pixel_perfect} id={`chPixelPerfect_${this.props.index}`}>Pixel Perfect - { - this.props.appState.controlnetApiVersion > 1 && - - Control Mode: - Balanced - Prompt - ControlNet - - } - -
- - Weight: - {storeData.weight} - - - Guidance strength start: - {storeData.guidance_start} - - - Guidance strength end: - {storeData.guidance_end} - - {ppSlider && ppSlider[0] && !storeData.pixel_perfect && - {ppSlider[0].name}: - {storeData.processor_res.toFixed(2)} - } - {ppSlider && ppSlider[1] && - {ppSlider[1].name}: - {storeData.threshold_a.toFixed(2)} - } - {ppSlider && ppSlider[2] && - {ppSlider[2].name}: - {storeData.threshold_b.toFixed(2)} - } +
+ + Weight: + + {storeData.weight} + + + + + Guidance strength start: + + + {storeData.guidance_start} + + + + + Guidance strength end: + + + {storeData.guidance_end} + + + {ppSlider && + ppSlider[0] && + !storeData.pixel_perfect && ( + + + {ppSlider[0].name}: + + + {storeData.processor_res.toFixed(2)} + + + )} + {ppSlider && ppSlider[1] && ( + + + {ppSlider[1].name}: + + + {storeData.threshold_a.toFixed(2)} + + + )} + {ppSlider && ppSlider[2] && ( + + + {ppSlider[2].name}: + + + {storeData.threshold_b.toFixed(2)} + + + )} +
+
+
+ + {!pd.model_free && ( + + )}
-
- - {!pd.model_free && - () - } -
-
+ ) } } diff --git a/typescripts/controlnet/entry.ts b/typescripts/controlnet/entry.ts index 6007ad2..db1b9fb 100644 --- a/typescripts/controlnet/entry.ts +++ b/typescripts/controlnet/entry.ts @@ -1,16 +1,20 @@ -import { Enum, api } from "../util/oldSystem"; -import { store, versionCompare } from "./main" +import { Enum, api } from '../util/oldSystem' +import { store, versionCompare } from './main' -declare const g_sd_config_obj: any; -declare let g_sd_url: string; +declare const g_sd_config_obj: any +declare let g_sd_url: string async function requestControlNetPreprocessors() { - const control_net_json = await api.requestGet(`${g_sd_url}/controlnet/module_list?alias_name=1`) + const control_net_json = await api.requestGet( + `${g_sd_url}/controlnet/module_list?alias_name=1` + ) return control_net_json } async function requestControlNetModelList(): Promise { - const control_net_json = await api.requestGet(`${g_sd_url}/controlnet/model_list`) + const control_net_json = await api.requestGet( + `${g_sd_url}/controlnet/model_list` + ) const model_list = control_net_json?.model_list return model_list @@ -36,15 +40,14 @@ async function initializeControlNetTab(controlnet_max_models: number) { try { const models = await requestControlNetModelList() - store.supportedModels = models || []; + store.supportedModels = models || [] } catch (e) { console.warn(e) } try { const pps = await requestControlNetPreprocessors() - store.supportedPreprocessors = pps ? pps.module_list : []; + store.supportedPreprocessors = pps ? pps.module_list : [] store.preprocessorDetail = pps ? pps.module_detail : {} - } catch (e) { console.warn(e) } @@ -52,9 +55,10 @@ async function initializeControlNetTab(controlnet_max_models: number) { function getEnableControlNet(index: number) { if (typeof index == 'undefined') - return store.controlNetUnitData.filter(item => item.enabled).length > 0 - else - return store.controlNetUnitData[index || 0].enabled + return ( + store.controlNetUnitData.filter((item) => item.enabled).length > 0 + ) + else return store.controlNetUnitData[index || 0].enabled } function mapPluginSettingsToControlNet(plugin_settings: any) { const ps = plugin_settings // for shortness @@ -79,8 +83,9 @@ function mapPluginSettingsToControlNet(plugin_settings: any) { guessmode: false, } if (store.controlnetApiVersion > 1) { - controlnet_units[index].control_mode = store.controlNetUnitData[index].control_mode; - controlnet_units[index].pixel_perfect = true; + controlnet_units[index].control_mode = + store.controlNetUnitData[index].control_mode + controlnet_units[index].pixel_perfect = true } } @@ -89,7 +94,7 @@ function mapPluginSettingsToControlNet(plugin_settings: any) { plugin_settings['mode'] === Enum.generationModeEnum['Inpaint'] || plugin_settings['mode'] === Enum.generationModeEnum['Outpaint'] ) { - const b_use_guess_mode = store.controlNetUnitData[0].guessmode; + const b_use_guess_mode = store.controlNetUnitData[0].guessmode controlnet_units[0]['guessmode'] = b_use_guess_mode } @@ -105,23 +110,23 @@ function mapPluginSettingsToControlNet(plugin_settings: any) { args: controlnet_units, }, }, - } return controlnet_payload } function getControlNetMaxModelsNumber() { - return store.maxControlNet; + return store.maxControlNet } function getUnitsData() { return store.controlNetUnitData } function setControlMaskSrc(base64: string, index: number) { - store.controlNetUnitData[index].mask = base64; + store.controlNetUnitData[index].mask = base64 } function isControlNetModeEnable() { //@ts-ignore - let is_tab_enabled = !document.getElementById('chDisableControlNetTab').checked + let is_tab_enabled = !document.getElementById('chDisableControlNetTab') + .checked let numOfEnabled = 0 if (is_tab_enabled) { @@ -138,7 +143,7 @@ function isControlNetModeEnable() { return is_mode_enabled } function getModuleDetail() { - return store.preprocessorDetail; + return store.preprocessorDetail } export { requestControlNetModelList, @@ -150,5 +155,5 @@ export { getUnitsData, setControlMaskSrc, isControlNetModeEnable, - getModuleDetail -} \ No newline at end of file + getModuleDetail, +} diff --git a/typescripts/controlnet/main.tsx b/typescripts/controlnet/main.tsx index 797ae17..27bddc5 100644 --- a/typescripts/controlnet/main.tsx +++ b/typescripts/controlnet/main.tsx @@ -1,16 +1,13 @@ import ReactDOM from 'react-dom/client' -import React from 'react'; -import ControlNetTab from './ControlNetTab'; +import React from 'react' +import ControlNetTab from './ControlNetTab' import store from './store' import { versionCompare } from './util' -const elem = document.getElementById('sp-control_net-tab-page'); +const elem = document.getElementById('sp-control_net-tab-page') if (elem) { const root = ReactDOM.createRoot(elem) - root.render() + root.render() } -export { - store, - versionCompare -} \ No newline at end of file +export { store, versionCompare } diff --git a/typescripts/controlnet/store.ts b/typescripts/controlnet/store.ts index 20cc679..4cf00fa 100644 --- a/typescripts/controlnet/store.ts +++ b/typescripts/controlnet/store.ts @@ -1,14 +1,14 @@ -import { observable, reaction } from "mobx"; +import { observable, reaction } from 'mobx' export const DefaultControlNetUnitData = { enabled: false, input_image: '', mask: '', - module: "", - model: "", + module: '', + model: '', weight: 1.0, - resize_mode: "Scale to Fit (Inner Fit)", + resize_mode: 'Scale to Fit (Inner Fit)', lowvram: true, processor_res: 512, threshold_a: 0, @@ -18,38 +18,41 @@ export const DefaultControlNetUnitData = { guidance_end: 1, guessmode: false, - control_mode: "Balanced", + control_mode: 'Balanced', pixel_perfect: true, } export interface controlNetUnitData { - enabled: boolean, - input_image: string, - mask: string, + enabled: boolean + input_image: string + mask: string - module: string, - model: string, - weight: number, - resize_mode: "Just Resize" | "Crop and Resize" | "Resize and Fill", - lowvram: boolean, - processor_res: number, - threshold_a: number, - threshold_b: number, + module: string + model: string + weight: number + resize_mode: 'Just Resize' | 'Crop and Resize' | 'Resize and Fill' + lowvram: boolean + processor_res: number + threshold_a: number + threshold_b: number - guidance_start: number, - guidance_end: number, - guessmode: boolean, + guidance_start: number + guidance_end: number + guessmode: boolean - control_mode: "Balanced" | "My prompt is more important" | "ControlNet is more important", - pixel_perfect: boolean, + control_mode: + | 'Balanced' + | 'My prompt is more important' + | 'ControlNet is more important' + pixel_perfect: boolean } interface ControlNetMobxStore { - maxControlNet: number, - controlnetApiVersion: number, + maxControlNet: number + controlnetApiVersion: number - supportedModels: string[], - supportedPreprocessors: string[], - preprocessorDetail: {[key: string]: any}, + supportedModels: string[] + supportedPreprocessors: string[] + preprocessorDetail: { [key: string]: any } controlNetUnitData: controlNetUnitData[] } @@ -62,12 +65,12 @@ var ControlNetStore = observable({ supportedPreprocessors: [], preprocessorDetail: {}, - controlNetUnitData: [] -}); + controlNetUnitData: [], +}) reaction( () => { - return ControlNetStore.controlNetUnitData.map(data => data.module) + return ControlNetStore.controlNetUnitData.map((data) => data.module) }, (module_, index) => { ControlNetStore.controlNetUnitData.forEach((data, index) => { @@ -81,11 +84,16 @@ reaction( ) reaction( () => ControlNetStore.maxControlNet, - maxControlNet => { - ControlNetStore.controlNetUnitData = Array(maxControlNet).fill(0).map((v, index) => { - return ControlNetStore.controlNetUnitData[index] || DefaultControlNetUnitData; - }) + (maxControlNet) => { + ControlNetStore.controlNetUnitData = Array(maxControlNet) + .fill(0) + .map((v, index) => { + return ( + ControlNetStore.controlNetUnitData[index] || + DefaultControlNetUnitData + ) + }) } ) -export default ControlNetStore \ No newline at end of file +export default ControlNetStore diff --git a/typescripts/controlnet/util.tsx b/typescripts/controlnet/util.tsx index 2b26710..1d33aae 100644 --- a/typescripts/controlnet/util.tsx +++ b/typescripts/controlnet/util.tsx @@ -1,10 +1,18 @@ - -export function mapRange(x: number, in_min: number, in_max: number, out_min: number, out_max: number, step: number) { - return Math.round( - ( - ((x - in_min) * (out_max - out_min)) / (in_max - in_min) + out_min - ) / step - ) * step +export function mapRange( + x: number, + in_min: number, + in_max: number, + out_min: number, + out_max: number, + step: number +) { + return ( + Math.round( + (((x - in_min) * (out_max - out_min)) / (in_max - in_min) + + out_min) / + step + ) * step + ) } export function versionCompare(to: string, from: string) { @@ -14,13 +22,15 @@ export function versionCompare(to: string, from: string) { for (let i = 0; i < Math.max(vTo.length, vFrom.length); i++) { const vFromI = +(vFrom[i] || 0) const vToI = +(vTo[i] || 0) - if (isNaN(vFromI) || isNaN(vToI)) { throw new Error(`invalid version ${vTo} or ${vFrom} `) } + if (isNaN(vFromI) || isNaN(vToI)) { + throw new Error(`invalid version ${vTo} or ${vFrom} `) + } if (vFromI > vToI) { return -1 - } else if (vFromI < vToI) { - return 1; + } else if (vFromI < vToI) { + return 1 } } - return 0; -} \ No newline at end of file + return 0 +} diff --git a/typescripts/entry.ts b/typescripts/entry.ts index c99ebc0..b3959fb 100644 --- a/typescripts/entry.ts +++ b/typescripts/entry.ts @@ -4,16 +4,3 @@ export * as ultimate_sd_upscaler from './ultimate_sd_upscaler/ultimate_sd_upscal export * as scripts from './ultimate_sd_upscaler/scripts' export * as main from './main/main' export * as logger from './util/logger' - - - - - - - - - - - - - diff --git a/typescripts/main/astore.ts b/typescripts/main/astore.ts index c6466db..23b681e 100644 --- a/typescripts/main/astore.ts +++ b/typescripts/main/astore.ts @@ -24,4 +24,4 @@ export class AStore { toJsFunc() { return toJS(this) } -} \ No newline at end of file +} diff --git a/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx b/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx index 8efafaa..1133474 100644 --- a/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx +++ b/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx @@ -159,18 +159,16 @@ export class UltimateSDUpscalerForm extends React.Component<{ } async getUpscalers() { - try{ - + try { const sd_upscalers_json = await requestGetUpscalers() const sd_upscalers = sd_upscalers_json.map( (upscaler: any) => upscaler.name - ) - this.setState({ sd_upscalers: sd_upscalers }) - return sd_upscalers - } - catch(e){ - console.warn("ultimate sd upscaler getUpscalers(): ",e) - } + ) + this.setState({ sd_upscalers: sd_upscalers }) + return sd_upscalers + } catch (e) { + console.warn('ultimate sd upscaler getUpscalers(): ', e) + } } handleRefresh = async () => { diff --git a/typescripts/util/elements.tsx b/typescripts/util/elements.tsx index e4a22ea..3e5d2c3 100644 --- a/typescripts/util/elements.tsx +++ b/typescripts/util/elements.tsx @@ -2,11 +2,9 @@ import React, { CSSProperties, ReactEventHandler, useState } from 'react' // import ReactDOM from 'react-dom' import ReactDOM from 'react-dom/client' // import { versions } from 'uxp' -export { ReactComponent as MoveToCanvasSvg } from '../../icon/move_to_canvas.svg'; -export { ReactComponent as PenSvg } from '../../icon/pen.svg'; -export { ReactComponent as PreviewSvg } from '../../icon/preview.svg'; - - +export { ReactComponent as MoveToCanvasSvg } from '../../icon/move_to_canvas.svg' +export { ReactComponent as PenSvg } from '../../icon/pen.svg' +export { ReactComponent as PreviewSvg } from '../../icon/preview.svg' declare global { namespace JSX { @@ -266,11 +264,9 @@ export class SpMenu extends React.Component<{ } } class PhotoshopElem extends React.Component<{ [key: string]: any }, {}> { - protected elem: Element | null = null; + protected elem: Element | null = null - protected curEvents: { [key: string]: (evt: Event) => any } = { - - } + protected curEvents: { [key: string]: (evt: Event) => any } = {} componentDidMount(): void { this.updateEventListener() @@ -281,35 +277,34 @@ class PhotoshopElem extends React.Component<{ [key: string]: any }, {}> { // } updateEventListener() { - if (!this.elem) throw new Error('elem is not rendered with ref'); + if (!this.elem) throw new Error('elem is not rendered with ref') const [, newEvent] = this.splitProps(this.props) - Object.keys(this.curEvents).forEach(evkey => { + Object.keys(this.curEvents).forEach((evkey) => { if (this.curEvents[evkey] != newEvent[evkey]) { - this.elem?.removeEventListener(evkey, this.curEvents[evkey]); + this.elem?.removeEventListener(evkey, this.curEvents[evkey]) } - }); - Object.keys(newEvent).forEach(evkey => { - this.elem?.addEventListener(evkey, newEvent[evkey]); + }) + Object.keys(newEvent).forEach((evkey) => { + this.elem?.addEventListener(evkey, newEvent[evkey]) }) } componentWillUnmount(): void { - Object.keys(this.curEvents).forEach(evkey => { - this.elem?.removeEventListener(evkey, this.curEvents[evkey]); - }); + Object.keys(this.curEvents).forEach((evkey) => { + this.elem?.removeEventListener(evkey, this.curEvents[evkey]) + }) } splitProps(props: any): [any, any] { - const attr: any = {}; - const event: any = {}; + const attr: any = {} + const event: any = {} Object.keys(props).forEach((propKey: string) => { if (propKey.startsWith('on')) { const key = propKey[2].toLocaleLowerCase() + propKey.slice(3) - event[key] = props[propKey]; - + event[key] = props[propKey] } else { - attr[propKey] = props[propKey]; + attr[propKey] = props[propKey] } }) return [attr, event] @@ -318,81 +313,131 @@ class PhotoshopElem extends React.Component<{ [key: string]: any }, {}> { export class SpPicker extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpMenuComponent extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpMenuItem extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpLabel extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpCheckBox extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) if (!attr['checked']) delete attr['checked'] - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpSlider extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpRadioGroup extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpRadio extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } export class SpDivider extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - return this.elem = elem} {...attr}> + return ( + (this.elem = elem)} + {...attr} + > + ) } } - -export class Thumbnail extends React.Component<{children:React.ReactNode}> { - - render() { - return
- - {this.props.children} -
+export class Thumbnail extends React.Component<{ children: React.ReactNode }> { + render() { + return ( +
{this.props.children}
+ ) } } - - export class ActionButtonSVG extends PhotoshopElem { render() { const [attr] = this.splitProps(this.props) - - return this.elem = elem} {...attr}> - -
- {this.props.children} -
- }} - + return ( + (this.elem = elem)} + {...attr} + > +
+ {this.props.children} +
+ + ) + } +} diff --git a/typescripts/util/logger.ts b/typescripts/util/logger.ts index 154ce3e..72e39a6 100644 --- a/typescripts/util/logger.ts +++ b/typescripts/util/logger.ts @@ -1,7 +1,5 @@ - -import {format} from 'util'; -export function formateLog(data: any, ...optional_param: any[]){ - - const formattedOutput = format(data, ...optional_param); +import { format } from 'util' +export function formateLog(data: any, ...optional_param: any[]) { + const formattedOutput = format(data, ...optional_param) return formattedOutput -} \ No newline at end of file +} diff --git a/typescripts/util/oldSystem.tsx b/typescripts/util/oldSystem.tsx index 6b58e08..d976e2c 100644 --- a/typescripts/util/oldSystem.tsx +++ b/typescripts/util/oldSystem.tsx @@ -1,5 +1,5 @@ //@ts-ignore -const req = window['require']; +const req = window['require'] // because we use window['require'], so the base path of this require function is the root path of plugin. const selection = req('./selection') @@ -26,5 +26,5 @@ export { html_manip, psapi, general, - io -} \ No newline at end of file + io, +} diff --git a/utility/presets/preset.js b/utility/presets/preset.js index f597d0e..81096c8 100644 --- a/utility/presets/preset.js +++ b/utility/presets/preset.js @@ -160,9 +160,9 @@ function getPresetSettings(preset_type) { if (preset_type === Enum.PresetTypeEnum['SDPreset']) { preset_settings = g_ui_settings_object.getSettings() } else if (preset_type === Enum.PresetTypeEnum['ControlNetPreset']) { - const { getUnitsData } = require('../../typescripts/dist/bundle').control_net // only import ControlNetUnit to avoid circular dependency + const { getUnitsData } = + require('../../typescripts/dist/bundle').control_net // only import ControlNetUnit to avoid circular dependency preset_settings = getUnitsData() - } return preset_settings } diff --git a/webpack.config.js b/webpack.config.js index 535dcc3..cb8db4f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,3 @@ - const path = require('path') // const CleanWebpackPlugin = require('clean-webpack-plugin') const CopyPlugin = require('copy-webpack-plugin') @@ -23,11 +22,10 @@ module.exports = { }, resolve: { extensions: ['.tsx', '.ts', '.js', '.jsx'], - - fallback: { - "util": require.resolve("util/") - } - + + fallback: { + util: require.resolve('util/'), + }, }, module: { rules: [ @@ -64,7 +62,6 @@ module.exports = { test: /\.svg$/, use: ['@svgr/webpack', 'url-loader'], }, - ], }, plugins: [