Skip to content

Commit

Permalink
fix: merge conflicts of pressable
Browse files Browse the repository at this point in the history
  • Loading branch information
Rajat Chaudhary authored and Rajat Chaudhary committed Mar 6, 2024
2 parents f7a125a + f115b43 commit 5b68226
Show file tree
Hide file tree
Showing 298 changed files with 7,054 additions and 1,943 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/trigger-ui-update-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Trigger gluestack-style-website | Create PR when pushed to master

on:
pull_request:
branches:
- patch

jobs:
build:
name: Dispatch to 'gluestack-style-website'
runs-on: ubuntu-latest
steps:
- name: Emit repository_dispatch
uses: mvasigh/dispatch-action@main
with:
# You should create a personal access token and store it in your repository
token: ${{ secrets.MY_GITHUB_TOKEN }}
repo: ui-website
owner: gluestack
event_type: build_ui_docs
message: |
{
"repo": "ui",
"branch": "${{ github.head_ref }}"
}
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules

*.mdx
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
"prettier.ignorePath": ".prettierignore",
// If true, puts the `>` of a multi-line jsx element at the end of the last line instead of being alone on the next line
"editor.wordWrap": "on",
"cSpell.words": ["Actionsheet", "gluestack", "nativewind", "themeable"],
"cSpell.words": [
"Actionsheet",
"gluestack",
"nativewind",
"tailwindcss",
"themeable"
],
"cSpell.enableFiletypes": ["mdx"],
"tailwindCSS.experimental.classRegex": [
["tva\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
Expand Down
4 changes: 2 additions & 2 deletions example/storybook-nativewind/.storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { DocsContainer } from '@storybook/addon-docs/blocks';
import { OverlayProvider } from '@gluestack-ui/overlay';
import { ToastProvider } from '@gluestack-ui/toast';

import { GluestackUIProvider as GluestackUIWithNativewindProvider } from '../src/components-example/nativewind/GluestackUIProvider';
import { GluestackUIProvider as GluestackUIWithNativewindProvider } from '../src/core-components/nativewind/gluestack-ui-provider';

// global css getting resolved from babel.config.js
import 'global.css';

import { GluestackUIProvider as GluestackUIWithGluestackStyleProvider } from '../src/components-example/themed/GluestackUIProvider';
import { GluestackUIProvider as GluestackUIWithGluestackStyleProvider } from '../src/core-components/themed/gluestack-ui-provider';

import gstheme from './gstheme';
import { themes } from '@storybook/theming';
Expand Down
8 changes: 6 additions & 2 deletions example/storybook-nativewind/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ module.exports = function (api) {
alias: {
'@/components/ui':
process.env.STYLE_ENGINE === 'nativewind'
? path.resolve(__dirname, './src/components-example/nativewind')
: path.resolve(__dirname, './src/components-example/themed'),
? path.resolve(__dirname, './src/core-components/nativewind')
: path.resolve(__dirname, './src/core-components/themed'),

'global.css':
process.env.STYLE_ENGINE === 'nativewind'
Expand Down Expand Up @@ -46,6 +46,10 @@ module.exports = function (api) {
__dirname,
'../../packages/unstyled/button/src'
),
'@gluestack-ui/link': path.resolve(
__dirname,
'../../packages/unstyled/link/src'
),
'@gluestack-ui/accordion': path.resolve(
__dirname,
'../../packages/unstyled/accordion/src'
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
AccordionIcon,
AccordionContent,
AccordionContentText,
} from '@/components/ui/Accordion';
} from '@/components/ui/accordion';
import {
ChevronDownIcon,
ChevronUpIcon,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import { transformedCode } from '../../utils';

<Meta title="common/components/Accordion" />

import Wrapper from '../../components-example/themed/Wrapper';
import Wrapper from '../../core-components/themed/Wrapper';

This is an illustration of **Accordion** component.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

title: Accordion | gluestack-ui | Installation, Usage, and API

description: The Accordion component is a versatile and interactive user interface element, designed to efficiently organize and present content in a compact space.
Expand All @@ -9,7 +8,7 @@ pageTitle: Accordion
pageDescription: The Accordion component is a versatile and interactive user interface element, designed to efficiently organize and present content in a compact space.

showHeader: true

---
import { Meta } from '@storybook/addon-docs';

<Meta title="with-gluestack-style/components/Disclosure/Accordion" />
Expand All @@ -28,7 +27,7 @@ import {
ChevronUpIcon,
PlusIcon,
MinusIcon,
} from '../../components-example/themed';
} from '../../core-components/themed';
import {
AppProvider,
CodePreview,
Expand All @@ -40,8 +39,8 @@ import {
Alert,
} from '@gluestack/design-system';
import { transformedCode } from '../../utils';
import { config } from '../../components-example/themed/GluestackUIProvider/config';
import Wrapper from '../../components-example/themed/Wrapper';
import { config } from '../../core-components/themed/gluestack-ui-provider/config';
import Wrapper from '../../core-components/themed/Wrapper';

# Accordion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
ActionsheetSectionList,
ActionsheetSectionHeaderText,
ActionsheetVirtualizedList,
} from '@/components/ui/Actionsheet';
} from '@/components/ui/actionsheet';

const ActionsheetBasic = ({ showActionsheetProp, ...props }: any) => {
const [showActionsheet, setShowActionsheet] = React.useState(false);
Expand Down
Loading

0 comments on commit 5b68226

Please sign in to comment.