-
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vaev-browser: Unified the inspector and hideo-browser.
- Loading branch information
1 parent
d67ce31
commit ca5669c
Showing
15 changed files
with
337 additions
and
384 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| #include <karm-kira/side-panel.h> | ||
| #include <karm-ui/input.h> | ||
| #include <karm-ui/layout.h> | ||
| #include <karm-ui/reducer.h> | ||
| #include <karm-ui/resizable.h> | ||
| #include <karm-ui/scroll.h> | ||
| #include <karm-ui/view.h> | ||
| #include <mdi/chevron-down.h> | ||
| #include <mdi/chevron-right.h> | ||
| #include <vaev-markup/dom.h> | ||
| #include <vaev-style/styles.h> | ||
|
|
||
| #include "inspect.h" | ||
|
|
||
| namespace Vaev::Browser { | ||
|
|
||
| auto guide() { | ||
| return Ui::hflow( | ||
| Ui::empty(8), | ||
| Ui::separator(), | ||
| Ui::empty(9) | ||
| ); | ||
| } | ||
|
|
||
| auto idented(isize ident) { | ||
| return [ident](Ui::Child c) -> Ui::Child { | ||
| Ui::Children res; | ||
| res.pushBack(Ui::empty(4)); | ||
| for (isize i = 0; i < ident; i++) { | ||
| res.pushBack(guide()); | ||
| } | ||
| res.pushBack(c); | ||
| return Ui::hflow(res); | ||
| }; | ||
| } | ||
|
|
||
| Ui::Child elementStartTag(Markup::Element const &el, bool expanded) { | ||
| return Ui::text( | ||
| Ui::TextStyles::codeSmall().withColor(Ui::ACCENT500), | ||
| expanded ? "<{}>" : "<{}> … </{}>", el.tagName, el.tagName | ||
| ); | ||
| } | ||
|
|
||
| Ui::Child elementEndTag(Markup::Element const &el) { | ||
| return Ui::text( | ||
| Ui::TextStyles::codeSmall().withColor(Ui::ACCENT500), | ||
| "</{}>", el.tagName | ||
| ); | ||
| } | ||
|
|
||
| Ui::Child itemHeader(Strong<Markup::Node> n, Ui::Action<InspectorAction> a, bool expanded) { | ||
| if (n.is<Markup::Document>()) { | ||
| return Ui::codeMedium("#document"); | ||
| } else if (n.is<Markup::DocumentType>()) { | ||
| return Ui::codeMedium("#document-type"); | ||
| } else if (auto tx = n.is<Markup::Text>()) { | ||
| return Ui::codeMedium("{#}", tx->data); | ||
| } else if (auto el = n.is<Markup::Element>()) { | ||
| if (el->children().len()) { | ||
| return Ui::hflow( | ||
| Ui::icon( | ||
| expanded ? Mdi::CHEVRON_DOWN : Mdi::CHEVRON_RIGHT | ||
| ) | | ||
| Ui::button( | ||
| [n, a](auto &btn) { | ||
| a(btn, ExpandNode{n}); | ||
| }, | ||
| Ui::ButtonStyle::subtle() | ||
| ), | ||
| elementStartTag(*el, expanded) | ||
| ); | ||
| } else { | ||
| return elementStartTag(*el, false); | ||
| } | ||
| } else if (auto c = n.is<Markup::Comment>()) { | ||
| return Ui::codeMedium(Gfx::GREEN, "<!-- {} -->", c->data); | ||
| } else { | ||
| unreachable(); | ||
| } | ||
| } | ||
|
|
||
| Ui::Child itemFooter(Strong<Markup::Node> n, isize ident) { | ||
| if (auto el = n.is<Markup::Element>()) | ||
| return Ui::hflow(n->children().len() ? guide() : Ui::empty(), elementEndTag(*el)) | idented(ident); | ||
| return Ui::empty(); | ||
| } | ||
|
|
||
| Ui::ButtonStyle selected() { | ||
| return { | ||
| .idleStyle = { | ||
| .backgroundFill = Ui::GRAY800, | ||
| .foregroundFill = Ui::GRAY300, | ||
| }, | ||
| .hoverStyle = { | ||
| .borderWidth = 1, | ||
| .backgroundFill = Ui::GRAY600, | ||
| }, | ||
| .pressStyle = { | ||
| .borderWidth = 1, | ||
| .backgroundFill = Ui::GRAY700, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| Ui::Child item(Strong<Markup::Node> n, InspectState const &s, Ui::Action<InspectorAction> a, bool expanded, isize ident) { | ||
| auto style = s.selectedNode == n ? selected() : Ui::ButtonStyle::subtle().withRadii(0); | ||
| return Ui::button( | ||
| [n, a](auto &btn) { | ||
| a(btn, SelectNode{n}); | ||
| }, | ||
| style, | ||
| itemHeader(n, a, expanded) | idented(ident) | ||
| ); | ||
| } | ||
|
|
||
| Ui::Child node(Strong<Markup::Node> n, InspectState const &s, Ui::Action<InspectorAction> a, isize ident = 0) { | ||
| bool expanded = n.is<Markup::Document>() or s.expandedNodes.has(n); | ||
| Ui::Children children{item(n, s, a, expanded, ident)}; | ||
|
|
||
| if (expanded) { | ||
| for (auto &c : n->children()) { | ||
| children.pushBack(node(c, s, a, n.is<Markup::Document>() ? 0 : ident + 1)); | ||
| } | ||
| children.pushBack(itemFooter(n, ident)); | ||
| } | ||
| return Ui::vflow(children); | ||
| } | ||
|
|
||
| Ui::Child computedStyles() { | ||
| Ui::Children children; | ||
|
|
||
| Style::StyleProp::any([&]<typename T>(Meta::Type<T>) { | ||
| if constexpr (requires { T::initial(); }) { | ||
| children.pushBack(Ui::text(Ui::TextStyles::codeSmall(), "{}: {}", T::name(), T::initial()) | Ui::insets({4, 8})); | ||
| } | ||
| }); | ||
|
|
||
| return Ui::vflow( | ||
| Kr::sidePanelTitle("Computed Styles") | Ui::dragRegion({0, -1}), | ||
| Ui::separator(), | ||
| Ui::vflow(children) | Ui::vscroll() | Ui::grow() | ||
| ) | | ||
| Ui::pinSize(128); | ||
| } | ||
|
|
||
| Ui::Child inspect(Strong<Vaev::Markup::Document> n, InspectState const &s, Ui::Action<InspectorAction> a) { | ||
| return Ui::vflow( | ||
| node(n, s, a) | Ui::vscroll() | Ui::grow(), | ||
| computedStyles() | Ui::resizable(Ui::ResizeHandle::TOP, {128}, NONE) | ||
| ); | ||
| } | ||
|
|
||
| } // namespace Vaev::Browser |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #pragma once | ||
|
|
||
| #include <karm-ui/node.h> | ||
| #include <karm-ui/reducer.h> | ||
| #include <vaev-markup/dom.h> | ||
|
|
||
| namespace Vaev::Browser { | ||
|
|
||
| struct ExpandNode { | ||
| Strong<Markup::Node> node; | ||
| }; | ||
|
|
||
| struct SelectNode { | ||
| Strong<Markup::Node> node; | ||
| }; | ||
|
|
||
| using InspectorAction = Union<ExpandNode, SelectNode>; | ||
|
|
||
| struct InspectState { | ||
| Map<Strong<Markup::Node>, bool> expandedNodes = {}; | ||
| Opt<Strong<Markup::Node>> selectedNode = NONE; | ||
|
|
||
| void apply(InspectorAction &a) { | ||
| a.visit(Visitor{ | ||
| [&](ExpandNode e) { | ||
| if (expandedNodes.has(e.node)) | ||
| expandedNodes.del(e.node); | ||
| else | ||
| expandedNodes.put(e.node, true); | ||
| }, | ||
| [&](SelectNode e) { | ||
| if (e.node->children()) | ||
| expandedNodes.put(e.node, true); | ||
| selectedNode = e.node; | ||
| }, | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| Ui::Child inspect(Strong<Vaev::Markup::Document> dom, InspectState const &s, Ui::Action<InspectorAction> action); | ||
|
|
||
| } // namespace Vaev::Browser |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/apps/hideo-browser/main/manifest.json → src/web/vaev-browser/main/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.component.v1", | ||
| "id": "hideo-browser.main", | ||
| "id": "vaev-browser.main", | ||
| "props": { | ||
| "cpp-excluded": true | ||
| }, | ||
| "type": "exe", | ||
| "requires": [ | ||
| "hideo-browser" | ||
| "vaev-browser" | ||
| ] | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/apps/hideo-browser/manifest.json → src/web/vaev-browser/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.