Skip to content

Commit b73199f

Browse files
authored
chore: merge dev into main (#109)
2 parents b85422b + 49c249c commit b73199f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+11716
-43
lines changed

β€Ž.vitepress/config.mts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { defineConfig } from 'vitepress'
22
import apiSidebar from '../content/api/sidebar.json'
3+
import coreSidebar from '../content/core/sidebar'
34
import mainSidebar from '../content/sidebar'
45
import uiSidebar from '../content/ui/sidebar'
56
import nav from './nav'
@@ -37,6 +38,7 @@ export default defineConfig({
3738
nav,
3839
sidebar: {
3940
'/api': apiSidebar,
41+
'/core': coreSidebar,
4042
'/ui': uiSidebar,
4143
'/': mainSidebar,
4244
},

β€Ž.vitepress/nav.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default [
1212
{
1313
text: 'Docs',
1414
link: '/',
15-
activeMatch: '^/(?!plugins|best-practices|api|dev-reference|tutorials|ui)',
15+
activeMatch: '^/(?!plugins|best-practices|api|dev-reference|tutorials|ui|core)',
1616
icon: 'BookOpenIcon',
1717
},
1818

@@ -30,8 +30,7 @@ export default [
3030
},
3131
{
3232
text: 'Plugins',
33-
link: '/soon',
34-
activeMatch: '^/plugins',
33+
link: 'https://docs.nativescript.org/plugins/index.html',
3534
icon: 'CubeTransparentIcon',
3635
},
3736
// {
@@ -40,17 +39,23 @@ export default [
4039
// activeMatch: '^/best-practices',
4140
// icon: 'CheckIcon',
4241
// },
43-
{
44-
text: 'Integrations',
45-
link: '/soon',
46-
icon: 'CpuChipIcon',
47-
},
42+
// {
43+
// text: 'Integrations',
44+
// link: '/soon',
45+
// icon: 'CpuChipIcon',
46+
// },
4847
{
4948
text: 'UI Components',
5049
link: '/ui/',
5150
activeMatch: '^/ui',
5251
icon: 'CubeTransparentIcon',
5352
},
53+
{
54+
text: 'Core Reference',
55+
link: '/core/',
56+
activeMatch: '^/core',
57+
icon: 'CodeBracketIcon',
58+
},
5459
{
5560
text: 'API Reference',
5661
link: '/api/',

β€Žcontent/assets/diagrams/Android_View_Lifecycle.drawio.svg

Lines changed: 878 additions & 0 deletions
Loading

β€Žcontent/assets/diagrams/Frame_Page_Modal_Timeline.drawio.svg

Lines changed: 301 additions & 0 deletions
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
Β (0)