Skip to content

Commit 8d49b77

Browse files
jpudyszjpudysz
committed
feat: remove Variants deprecated logic
1 parent 0b6b0f5 commit 8d49b77

13 files changed

+9
-111
lines changed

‎cxx/core/UnistylesRegistry.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -198,18 +198,10 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
198198
return stylesheetsToRefresh;
199199
}
200200

201-
const core::Variants& core::UnistylesRegistry::getScopedVariants() {
202-
return this->_scopedVariants;
203-
}
204-
205201
const std::optional<std::string> core::UnistylesRegistry::getScopedTheme() {
206202
return this->_scopedTheme;
207203
}
208204

209-
void core::UnistylesRegistry::setScopedVariants(core::Variants&& variants) {
210-
this->_scopedVariants = std::move(variants);
211-
}
212-
213205
void core::UnistylesRegistry::setScopedTheme(std::optional<std::string> themeName) {
214206
this->_scopedTheme = std::move(themeName);
215207
}

‎cxx/core/UnistylesRegistry.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,12 @@ struct UnistylesRegistry: public StyleSheetRegistry {
4343
DependencyMap buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps);
4444
void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Value& maybePressableId);
4545
shadow::ShadowTrafficController trafficController{};
46-
const core::Variants& getScopedVariants();
4746
const std::optional<std::string> getScopedTheme();
48-
void setScopedVariants(core::Variants&& variants);
4947
void setScopedTheme(std::optional<std::string> themeName);
5048

5149
private:
5250
UnistylesRegistry() = default;
53-
54-
core::Variants _scopedVariants{};
51+
5552
std::optional<std::string> _scopedTheme{};
5653
std::unordered_map<jsi::Runtime*, UnistylesState> _states{};
5754
std::unordered_map<jsi::Runtime*, std::unordered_map<int, std::shared_ptr<core::StyleSheet>>> _styleSheetRegistry{};

‎cxx/hybridObjects/HybridShadowRegistry.cpp

+2-26
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
4747
// create unistyleData based on wrappers
4848
for (size_t i = 0; i < unistyleWrappers.size(); i++) {
4949
core::Unistyle::Shared& unistyle = unistyleWrappers[i];
50+
core::Variants variants{};
5051
std::shared_ptr<core::UnistyleData> unistyleData = std::make_shared<core::UnistyleData>(
5152
unistyle,
52-
registry.getScopedVariants(),
53+
variants, // todo pass real variants
5354
arguments[i],
5455
scopedTheme
5556
);
@@ -91,22 +92,6 @@ jsi::Value HybridShadowRegistry::unlink(jsi::Runtime &rt, const jsi::Value &this
9192
return jsi::Value::undefined();
9293
}
9394

94-
jsi::Value HybridShadowRegistry::selectVariants(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
95-
helpers::assertThat(rt, count == 1, "Unistyles: Invalid babel transform 'ShadowRegistry selectVariants' expected 1 arguments.");
96-
97-
auto& registry = core::UnistylesRegistry::get();
98-
99-
if (args[0].isUndefined()) {
100-
registry.setScopedVariants({});
101-
}
102-
103-
if (args[0].isObject()) {
104-
registry.setScopedVariants(helpers::variantsToPairs(rt, args[0].asObject(rt)));
105-
}
106-
107-
return jsi::Value::undefined();
108-
}
109-
11095
jsi::Value HybridShadowRegistry::setScopedTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
11196
helpers::assertThat(rt, count == 1, "Unistyles: setScopedTheme expected 1 argument.");
11297

@@ -132,12 +117,3 @@ jsi::Value HybridShadowRegistry::getScopedTheme(jsi::Runtime &rt, const jsi::Val
132117
? jsi::String::createFromUtf8(rt, maybeScopedTheme.value())
133118
: jsi::Value::undefined();
134119
}
135-
136-
jsi::Value HybridShadowRegistry::getVariants(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
137-
auto& registry = core::UnistylesRegistry::get();
138-
auto maybeScopedVariants = registry.getScopedVariants();
139-
140-
return maybeScopedVariants.size() > 0
141-
? helpers::variantsToValue(rt, maybeScopedVariants)
142-
: jsi::Value::undefined();
143-
}

‎cxx/hybridObjects/HybridShadowRegistry.h

-10
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
2020
const jsi::Value& thisValue,
2121
const jsi::Value* args,
2222
size_t count);
23-
jsi::Value selectVariants(jsi::Runtime& rt,
24-
const jsi::Value& thisValue,
25-
const jsi::Value* args,
26-
size_t count);
2723
jsi::Value setScopedTheme(jsi::Runtime& rt,
2824
const jsi::Value& thisValue,
2925
const jsi::Value* args,
@@ -32,21 +28,15 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
3228
const jsi::Value& thisValue,
3329
const jsi::Value* args,
3430
size_t count);
35-
jsi::Value getVariants(jsi::Runtime& rt,
36-
const jsi::Value& thisValue,
37-
const jsi::Value* args,
38-
size_t count);
3931

4032
void loadHybridMethods() override {
4133
HybridUnistylesShadowRegistrySpec::loadHybridMethods();
4234

4335
registerHybrids(this, [](Prototype& prototype) {
4436
prototype.registerRawHybridMethod("link", 2, &HybridShadowRegistry::link);
4537
prototype.registerRawHybridMethod("unlink", 1, &HybridShadowRegistry::unlink);
46-
prototype.registerRawHybridMethod("selectVariants", 1, &HybridShadowRegistry::selectVariants);
4738
prototype.registerRawHybridMethod("setScopedTheme", 1, &HybridShadowRegistry::setScopedTheme);
4839
prototype.registerRawHybridMethod("getScopedTheme", 0, &HybridShadowRegistry::getScopedTheme);
49-
prototype.registerRawHybridMethod("getVariants", 0, &HybridShadowRegistry::getVariants);
5040
});
5141
};
5242

‎cxx/parser/Parser.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -508,15 +508,16 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
508508

509509
// memoize metadata to call it later
510510
auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
511-
auto& registry = core::UnistylesRegistry::get();
512511

513512
unistyleFn->unprocessedValue = jsi::Value(rt, result).asObject(rt);
514513

515514
jsi::Value rawVariants = thisObject.hasProperty(rt, helpers::STYLE_VARIANTS.c_str())
516515
? thisObject.getProperty(rt, helpers::STYLE_VARIANTS.c_str())
517516
: jsi::Value::undefined();
517+
518+
Variants fakeVariants{};
518519
std::optional<Variants> variants = rawVariants.isUndefined()
519-
? registry.getScopedVariants()
520+
? fakeVariants // todo pass real variants
520521
: std::optional<Variants>(helpers::variantsToPairs(rt, rawVariants.asObject(rt)));
521522

522523
unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);

‎src/components/Variants.tsx

-30
This file was deleted.

‎src/components/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
export { Hide } from './Hide'
22
export { Display } from './Display'
3-
export { Variants } from './Variants'
43
export { ScopedTheme } from './ScopedTheme'

‎src/components/native/Pressable.native.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
4040
return unistyles
4141
}
4242

43-
if (state.pressed) {
44-
UnistylesShadowRegistry.selectVariants(variants)
45-
}
46-
4743
// @ts-expect-error hidden from TS
4844
UnistylesShadowRegistry.remove(storedRef.current)
4945
// @ts-expect-error - this is hidden from TS

‎src/components/native/Pressable.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ type PressableProps = Props & {
2222

2323
export const Pressable = forwardRef<View, PressableProps>(({ style, ...props }, forwardedRef) => {
2424
const scopedTheme = UnistylesShadowRegistry.getScopedTheme()
25-
const variants = UnistylesShadowRegistry.getVariants()
2625
let storedRef: HTMLElement | null = null
2726
let classNames: ReturnType<typeof getClassName> | undefined = undefined
2827

@@ -47,9 +46,7 @@ export const Pressable = forwardRef<View, PressableProps>(({ style, ...props },
4746
? style(state as WebPressableState)
4847
: style
4948
const previousScopedTheme = UnistylesShadowRegistry.getScopedTheme()
50-
const previousVariants = UnistylesShadowRegistry.getVariants()
5149

52-
UnistylesShadowRegistry.selectVariants(variants)
5350
UnistylesShadowRegistry.setScopedTheme(scopedTheme)
5451

5552
// @ts-expect-error hidden from TS
@@ -58,7 +55,6 @@ export const Pressable = forwardRef<View, PressableProps>(({ style, ...props },
5855
// @ts-expect-error hidden from TS
5956
UnistylesShadowRegistry.add(storedRef, classNames?.hash)
6057

61-
UnistylesShadowRegistry.selectVariants(previousVariants)
6258
UnistylesShadowRegistry.setScopedTheme(previousScopedTheme)
6359

6460
return classNames as any

‎src/core/createUnistylesComponent.tsx

-14
This file was deleted.

‎src/core/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export { createUnistylesComponent } from './createUnistylesComponent'
21
export { createUnistylesElement } from './createUnistylesElement'
32
export { createUnistylesImageBackground } from './createUnistylesImageBackground'
43
export { withUnistyles } from './withUnistyles'

‎src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export { StyleSheet, UnistylesRuntime, StatusBar, NavigationBar } from './specs'
22
export { mq } from './mq'
33
export type { UnistylesThemes, UnistylesBreakpoints } from './global'
4-
export { createUnistylesComponent, withUnistyles } from './core'
4+
export { withUnistyles } from './core'
55
export type { UnistylesVariants } from './types'
6-
export { Display, Hide, Variants, ScopedTheme } from './components'
6+
export { Display, Hide, ScopedTheme } from './components'

‎src/specs/ShadowRegistry/index.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@ import { NitroModules } from 'react-native-nitro-modules'
22
import type { UnistylesShadowRegistry as UnistylesShadowRegistrySpec } from './ShadowRegistry.nitro'
33
import type { ShadowNode, Unistyle, ViewHandle } from './types'
44

5-
type Variants = Record<string, string | boolean | undefined>
6-
75
interface ShadowRegistry extends UnistylesShadowRegistrySpec {
86
// Babel API
97
add(handle?: ViewHandle, styles?: Array<Unistyle>): void,
108
remove(handle?: ViewHandle): void,
119
// JSI
1210
link(node: ShadowNode, styles?: Array<Unistyle>): void,
1311
unlink(node: ShadowNode): void,
14-
selectVariants(variants?: Variants): void,
1512
setScopedTheme(themeName?: string): void,
16-
getScopedTheme(): string | undefined,
17-
getVariants(): Record<string, string | boolean | undefined> | undefined,
13+
getScopedTheme(): string | undefined
1814
}
1915

2016
const HybridShadowRegistry = NitroModules.createHybridObject<ShadowRegistry>('UnistylesShadowRegistry')

0 commit comments

Comments
 (0)