Skip to content

Commit

Permalink
Merge pull request #39 from pepabo/rename-alert-component
Browse files Browse the repository at this point in the history
AlertコンポーネントはCalloutにリネームします
  • Loading branch information
piyoppi authored Oct 2, 2024
2 parents 2b0e5ce + 2bdd0e6 commit 11a505a
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 35 deletions.
25 changes: 19 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions packages/alert/README.md

This file was deleted.

13 changes: 13 additions & 0 deletions packages/callout/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Inhouse Callout

## Usage

### Installation

```bash
$ npm install @pepabo-inhouse/callout

# or

$ yarn add @pepabo-inhouse/callout
```
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
}

@mixin export {
.in-alert {
.in-callout {
@include style;
}
}
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions packages/alert/package.json → packages/callout/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@pepabo-inhouse/alert",
"name": "@pepabo-inhouse/callout",
"description": "Inhouse Components for the web component",
"version": "1.4.1",
"version": "1.6.0",
"repository": {
"type": "git",
"url": "https://github.com/pepabo/inhouse-components-web.git",
"directory": "packages/alert"
"directory": "packages/callout"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/components-web/_index.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@forward "@pepabo-inhouse/adapter";
@forward "@pepabo-inhouse/alert" as alert-*;
@forward "@pepabo-inhouse/app-bar" as app-bar-*;
@forward "@pepabo-inhouse/avatar" as avatar-*;
@forward "@pepabo-inhouse/button" as button-*;
@forward "@pepabo-inhouse/callout" as callout-*;
@forward "@pepabo-inhouse/card" as card-*;
@forward "@pepabo-inhouse/cell" as cell-*;
@forward "@pepabo-inhouse/checkbox" as checkbox-*;
Expand Down
4 changes: 2 additions & 2 deletions packages/components-web/inhouse-components-web.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@use "@pepabo-inhouse/alert";
@use "@pepabo-inhouse/app-bar";
@use "@pepabo-inhouse/avatar";
@use "@pepabo-inhouse/bottom-navigation";
@use "@pepabo-inhouse/button";
@use "@pepabo-inhouse/callout";
@use "@pepabo-inhouse/card";
@use "@pepabo-inhouse/checkbox";
@use "@pepabo-inhouse/container";
Expand All @@ -27,11 +27,11 @@
// @import が存在しているので最初に flavor を読む
// see: https://git.pepabo.com/inhouse/components-web/issues/355
@include flavor.export;
@include alert.export;
@include app-bar.export;
@include avatar.export;
@include bottom-navigation.export;
@include button.export;
@include callout.export;
@include card.export;
@include checkbox.export;
@include container.export;
Expand Down
2 changes: 1 addition & 1 deletion packages/components-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
},
"devDependencies": {
"@pepabo-inhouse/adapter": "^1.4.1",
"@pepabo-inhouse/alert": "^1.4.1",
"@pepabo-inhouse/app-bar": "^1.4.1",
"@pepabo-inhouse/avatar": "^1.4.1",
"@pepabo-inhouse/bottom-navigation": "^1.4.1",
"@pepabo-inhouse/button": "^1.5.0",
"@pepabo-inhouse/callout": "^1.6.0",
"@pepabo-inhouse/card": "^1.4.1",
"@pepabo-inhouse/cell": "^1.4.1",
"@pepabo-inhouse/checkbox": "^1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/stories-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.21.4",
"@pepabo-inhouse/adapter": "^1.4.1",
"@pepabo-inhouse/alert": "^1.4.1",
"@pepabo-inhouse/app-bar": "^1.4.1",
"@pepabo-inhouse/avatar": "^1.4.1",
"@pepabo-inhouse/bottom-navigation": "^1.4.1",
"@pepabo-inhouse/button": "^1.5.0",
"@pepabo-inhouse/callout": "^1.6.0",
"@pepabo-inhouse/card": "^1.4.1",
"@pepabo-inhouse/cell": "^1.4.1",
"@pepabo-inhouse/checkbox": "^1.5.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type { StoryFn, Meta } from '@storybook/react'
import React from 'react'
import Alert, { Props } from './components/Alert'
import Callout, { Props } from './components/Callout'

export default {
title: 'Components/Alert',
component: Alert,
title: 'Components/Callout',
component: Callout,
size: 'm',
} as Meta

const Template: StoryFn<Props> = (args) => <Alert {...args} ></Alert>
const Template: StoryFn<Props> = (args) => <Callout {...args} ></Callout>

export const Index = Template.bind({})
Index.args = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export interface Props {
size?: Extract<Size, 's' | 'm' | 'l'>;
}

const Alert: FC<Props> = (props: Props) => {
const wrapperClasses = ['in-alert']
const Callout: FC<Props> = (props: Props) => {
const wrapperClasses = ['in-callout']
const {
color = "informative",
size = "m",
Expand All @@ -31,4 +31,4 @@ const Alert: FC<Props> = (props: Props) => {
)
}

export default Alert
export default Callout

0 comments on commit 11a505a

Please sign in to comment.