Skip to content

Add object-fit support to FxControl and calculateStyle functions #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pawloland wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −6
Open

Add object-fit support to FxControl and calculateStyle functions #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/contentScript/isolated/FxSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class FxSync {
handleChange = (view: StateView) => {


let styleInfo = calculateStyle(view.elementFx.enabled, view.elementFx.query || "video", formatFilters(view.elementFx.filters), formatFilters(view.elementFx.transforms.slice().reverse()), `${view.elementFx.originX || "center"} ${view.elementFx.originY || "center"}`, view.elementFx.svgFilters)
let styleInfo = calculateStyle(view.elementFx.enabled, view.elementFx.query || "video", formatFilters(view.elementFx.filters), formatFilters(view.elementFx.transforms.slice().reverse()), `${view.elementFx.originX || "center"} ${view.elementFx.originY || "center"}`, view.elementFx.svgFilters, view.elementFx.objectFit)

if (styleInfo) {
if (this.tempStyle && this.tempStyle.styleInfo.styleString !== styleInfo.styleString) {
Expand Down Expand Up @@ -89,13 +89,16 @@ export class FxSync {
}
}

export function calculateStyle(enabled: boolean, selector: string, filters: string, transforms: string, origin: string, svgFilters: SvgFilter[]) {
if (!enabled || !selector || !(filters || transforms || hasActiveSvgFilters(svgFilters))) return null
export function calculateStyle(enabled: boolean, selector: string, filters: string, transforms: string, origin: string, svgFilters: SvgFilter[], objectFit?: string) {
if (!enabled || !selector || !(filters || transforms || hasActiveSvgFilters(svgFilters) || objectFit)) return null
let statements = []
if (transforms) {
statements.push(`transform: ${transforms} !important`)
origin && statements.push(`transform-origin: ${origin} !important`)
}
if (objectFit) {
statements.push(`object-fit: ${objectFit} !important`)
}

let filterElements: SVGElement[]
let filterSvgUrls
Expand Down
32 changes: 30 additions & 2 deletions src/popup/FxControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export function FxControl(props: FxControlProps) {
elemFilter: checkFilterDeviationOrActiveSvg(elementFx.filters, elementFx.svgFilters),
elemTransform: checkFilterDeviation(elementFx.transforms),
backdropFilter: checkFilterDeviationOrActiveSvg(backdropFx.filters, backdropFx.svgFilters),
backdropTransform: checkFilterDeviation(backdropFx.transforms)
backdropTransform: checkFilterDeviation(backdropFx.transforms),
elemObjectFit: !!elementFx.objectFit
}), [elementFx, backdropFx])

const isEmpty = useMemo(() => (
Expand All @@ -54,7 +55,7 @@ export function FxControl(props: FxControlProps) {

{/* Target tabs */}
<div className="tabs">
<button className={`${!backdropTab ? "open" : ""} ${(active.elemFilter || active.elemTransform) ? "active" : ""}`} onClick={e => {
<button className={`${!backdropTab ? "open" : ""} ${(active.elemFilter || active.elemTransform || active.elemObjectFit) ? "active" : ""}`} onClick={e => {
setBackdropTab(false)
}}>{gvar.gsm.token.video}</button>
<button className={`${backdropTab ? "open" : ""} ${(active.backdropFilter || active.backdropTransform) ? "active" : ""}`} onClick={e => {
Expand Down Expand Up @@ -93,6 +94,33 @@ export function FxControl(props: FxControlProps) {
}}/>
</div>
)}

{/* Object Fit */}
{!backdropTab && (
<div className="selector">
<span>object-fit</span>
<select value={fx.objectFit || ""} onChange={e => {
setCurrent(produce(fx, d => {
if (e.target.value) {
d.objectFit = e.target.value as any
// Enable only when changing from default to a value
if (!fx.objectFit) {
d.enabled = true
}
} else {
delete d.objectFit
}
}))
}}>
<option key="default" value="">Default</option>
<option key="fill" value="fill">fill</option>
<option key="contain" value="contain">contain</option>
<option key="cover" value="cover">cover</option>
<option key="none" value="none">none</option>
<option key="scale-down" value="scale-down">scale-down</option>
</select>
</div>
)}

{/* Type tabs */}
<div className="tabs sm">
Expand Down
3 changes: 2 additions & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,8 @@ export type Fx = {
query?: string,
originX?: string,
originY?: string,
svgFilters?: SvgFilter[]
svgFilters?: SvgFilter[],
objectFit?: "fill" | "contain" | "cover" | "none" | "scale-down"
}

export type FilterInfo = {
Expand Down