Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions js/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ const opts: Array<BuildOptions> = [
entryPoints: { "data-frame/data-frame": "data-frame/index.tsx" },
plugins: [sassPlugin({ type: "css-text", sourceMap: false })],
},
{
entryPoints: {
"text-area/textarea-autoresize": "text-area/textarea-autoresize.ts",
},
},
{
entryPoints: {
"page-output/page-output": "page-output/page-output.ts",
Expand Down
6 changes: 0 additions & 6 deletions js/text-area/textarea-autoresize.css

This file was deleted.

86 changes: 0 additions & 86 deletions js/text-area/textarea-autoresize.ts

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/_pkg-sources.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
list(
bslib = "rstudio/bslib@main",
shiny = "rstudio/shiny@main",
shiny = "rstudio/shiny@feat/textAreaAutoResize",
sass = "sass",
htmltools = "rstudio/htmltools@main"
)
2 changes: 1 addition & 1 deletion shiny/ui/_html_deps_external.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

For...
* External dependencies (e.g. jQuery, Bootstrap), see `shiny.ui._html_deps_external`
* Internal dependencies (e.g. dataframe, autoresize), see `shiny.ui._html_deps_py_shiny`
* Internal dependencies (e.g. dataframe), see `shiny.ui._html_deps_py_shiny`
* shinyverse dependencies (e.g. bslib, htmltools), see `shiny.ui._html_deps_shinyverse`
"""

Expand Down
17 changes: 3 additions & 14 deletions shiny/ui/_html_deps_py_shiny.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from . import busy_indicators

"""
HTML dependencies for internal dependencies such as dataframe or text area's autoresize.
HTML dependencies for internal dependencies such as dataframe.

For...
* External dependencies (e.g. jQuery, Bootstrap), see `shiny.ui._html_deps_external`
* Internal dependencies (e.g. dataframe, autoresize), see `shiny.ui._html_deps_py_shiny`
* Internal dependencies (e.g. dataframe), see `shiny.ui._html_deps_py_shiny`
* shinyverse dependencies (e.g. bslib, htmltools), see `shiny.ui._html_deps_shinyverse`
"""

Expand Down Expand Up @@ -38,8 +38,7 @@ def chat_deps() -> list[HTMLDependency]:
script={"src": "chat.js", "type": "module"},
stylesheet={"href": "chat.css"},
)
# Chat's <textarea> input autoresizes
return [dep, markdown_stream_dependency(), autoresize_dependency()]
return [dep, markdown_stream_dependency()]


def markdown_stream_dependency() -> HTMLDependency:
Expand All @@ -55,16 +54,6 @@ def markdown_stream_dependency() -> HTMLDependency:
)


def autoresize_dependency() -> HTMLDependency:
return HTMLDependency(
"shiny-textarea-autoresize",
__version__,
source={"package": "shiny", "subdir": "www/py-shiny/text-area"},
script={"src": "textarea-autoresize.js", "type": "module"},
stylesheet={"href": "textarea-autoresize.css"},
)


def page_output_dependency() -> HTMLDependency:
return HTMLDependency(
"shiny-page-output",
Expand Down
2 changes: 0 additions & 2 deletions shiny/ui/_input_text.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from .._docstring import add_example
from ..bookmark import restore_input
from ..module import resolve_id
from ._html_deps_py_shiny import autoresize_dependency
from ._utils import shiny_input_label


Expand Down Expand Up @@ -196,7 +195,6 @@ def input_text_area(
return div(
shiny_input_label(resolved_id, label),
area,
autoresize_dependency() if autoresize else None,
class_="shiny-input-textarea form-group shiny-input-container",
style=css(width=width),
)
2 changes: 0 additions & 2 deletions shiny/www/py-shiny/text-area/textarea-autoresize.css

This file was deleted.

7 changes: 0 additions & 7 deletions shiny/www/py-shiny/text-area/textarea-autoresize.css.map

This file was deleted.

2 changes: 0 additions & 2 deletions shiny/www/py-shiny/text-area/textarea-autoresize.js

This file was deleted.

7 changes: 0 additions & 7 deletions shiny/www/py-shiny/text-area/textarea-autoresize.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion shiny/www/shared/_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
"package": "shiny",
"version": "1.10.0.9000 (rstudio/shiny@f79a22b987fbbbe008466f1ae9cb0b5543721917)"
"version": "1.10.0.9000 (rstudio/shiny@c672ee9e7fb3a16dfb78f7c02c26633c2c5a027a)"
}
2 changes: 1 addition & 1 deletion shiny/www/shared/bootstrap/_version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
"shiny_version": "1.10.0.9000 (rstudio/shiny@f79a22b987fbbbe008466f1ae9cb0b5543721917)",
"shiny_version": "1.10.0.9000 (rstudio/shiny@c672ee9e7fb3a16dfb78f7c02c26633c2c5a027a)",
"bslib_version": "0.9.0.9000 (rstudio/bslib@7cf80506c6beb9d7e5f2f146d2c9c935bbaf1635)",
"htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
"bootstrap_version": "5.3.1"
Expand Down
2 changes: 1 addition & 1 deletion shiny/www/shared/bootstrap/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion shiny/www/shared/sass/preset/bootstrap/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion shiny/www/shared/sass/preset/shiny/bootstrap.min.css

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions shiny/www/shared/sass/shiny/www/shared/shiny_scss/shiny.scss
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,14 @@ html.autoreload-enabled #shiny-disconnected-overlay.reloading {
width: 100%;
}

/* Styling for textAreaInput(autoresize=TRUE) */
textarea.textarea-autoresize.form-control {
padding: 5px 8px;
resize: none;
overflow-y: hidden;
height: auto;
}


#shiny-notification-panel {
position: fixed;
Expand Down
48 changes: 48 additions & 0 deletions shiny/www/shared/shiny.js

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

6 changes: 3 additions & 3 deletions shiny/www/shared/shiny.js.map

Large diffs are not rendered by default.

Loading
Loading