laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[REF-2269] Add add_imports API for component class (#2937)" (#2978)

Browse Source 
This reverts commit 8edd1dfdc9.
This commit is contained in:
Martin Xu 2024-04-01 15:57:03 -07:00 committed by GitHub
parent c357405c3e
commit 6d400eddc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
reflex/components/component.py
View File

@ -1029,16 +1029,6 @@ class Component(BaseComponent, ABC):
)
return _imports
def add_imports(
self,
) -> Dict[str, Union[str, ImportVar, List[str | ImportVar]]]:
"""User defined imports for the component. Need to be overriden in subclass.
Returns:
The user defined imports as a dict.
"""
return {}
def _get_imports(self) -> imports.ImportDict:
"""Get all the libraries and fields that are used by the component.
@ -1059,29 +1049,12 @@ class Component(BaseComponent, ABC):
var._var_data.imports for var in self._get_vars() if var._var_data
]
# If the subclass implements add_imports, merge the imports.
def _make_list(
value: str | ImportVar | list[str | ImportVar],
) -> list[str | ImportVar]:
if isinstance(value, (str, ImportVar)):
return [value]
return value
added_imports = {
package: [
ImportVar(tag=tag) if not isinstance(tag, ImportVar) else tag
for tag in _make_list(maybe_tags)
]
for package, maybe_tags in self.add_imports().items()
}
return imports.merge_imports(
*self._get_props_imports(),
self._get_dependencies_imports(),
self._get_hooks_imports(),
_imports,
event_imports,
added_imports,
*var_imports,
)

44
tests/components/test_component.py
View File

@ -1,4 +1,4 @@
from typing import Any, Dict, List, Type, Union
from typing import Any, Dict, List, Type
import pytest
@ -1310,48 +1310,6 @@ def test_custom_component_get_imports():
assert "other" in imports_outer
@pytest.mark.parametrize(
"tags",
(
["Component"],
["Component", "useState"],
[ImportVar(tag="Component")],
[ImportVar(tag="Component"), ImportVar(tag="useState")],
["Component", ImportVar(tag="useState")],
),
)
def test_custom_component_add_imports(tags):
def _list_to_import_vars(tags: List[str]) -> List[ImportVar]:
return [
ImportVar(tag=tag) if not isinstance(tag, ImportVar) else tag
for tag in tags
]
class BaseComponent(Component):
def _get_imports(self) -> imports.ImportDict:
return {}
class Reference(Component):
def _get_imports(self) -> imports.ImportDict:
return imports.merge_imports(
super()._get_imports(),
{"react": _list_to_import_vars(tags)},
)
class Test(Component):
def add_imports(
self,
) -> Dict[str, Union[str, ImportVar, List[str], List[ImportVar]]]:
return {"react": (tags[0] if len(tags) == 1 else tags)}
baseline = Reference.create()
test = Test.create()
assert baseline.get_imports() == {"react": _list_to_import_vars(tags)}
assert test.get_imports() == baseline.get_imports()
def test_custom_component_declare_event_handlers_in_fields():
class ReferenceComponent(Component):
def get_event_triggers(self) -> Dict[str, Any]: